From dbb28bb4f3ed06abc8512c728b1e990400ded723 Mon Sep 17 00:00:00 2001 From: reger Date: Wed, 17 Feb 2016 22:47:03 +0100 Subject: [PATCH] del unused statistic parameter (from status servlet) --- htroot/Status.java | 8 -------- source/net/yacy/peers/PeerActions.java | 4 ---- 2 files changed, 12 deletions(-) diff --git a/htroot/Status.java b/htroot/Status.java index a137ce0ea..0438c6ba6 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -221,14 +221,6 @@ public class Status final long uptime = 60000 * sb.peers.mySeed().getLong(Seed.UPTIME, 0L); prop.put("peerStatistics", "1"); prop.put("peerStatistics_uptime", PeerActions.formatInterval(uptime)); - prop.putNum("peerStatistics_pagesperminute", sb.peers.mySeed().getPPM()); - prop.putNum( - "peerStatistics_queriesperhour", - Math.round(6000d * sb.peers.mySeed().getQPM()) / 100d); - prop.putNum("peerStatistics_links", sb.peers.mySeed().getLinkCount()); - prop.put("peerStatistics_words", Formatter.number(sb.peers.mySeed().getWordCount())); - prop.putNum("peerStatistics_disconnects", sb.peers.peerActions.disconnects); - prop.put("peerStatistics_connects", Formatter.number(sb.peers.mySeed().get(Seed.CCOUNT, "0"))); thisHash = sb.peers.mySeed().hash; if ( sb.peers.mySeed().getIPs().size() == 0 ) { prop.put("peerAddress", "0"); // not assigned + instructions diff --git a/source/net/yacy/peers/PeerActions.java b/source/net/yacy/peers/PeerActions.java index 16a76507a..6d7ff619e 100644 --- a/source/net/yacy/peers/PeerActions.java +++ b/source/net/yacy/peers/PeerActions.java @@ -37,14 +37,12 @@ public class PeerActions { private final SeedDB seedDB; private Map userAgents; - public long disconnects; private final NewsPool newsPool; public PeerActions(final SeedDB seedDB, final NewsPool newsPool) { this.seedDB = seedDB; this.newsPool = newsPool; this.userAgents = new ConcurrentARC(10000, Runtime.getRuntime().availableProcessors() + 1); - this.disconnects = 0; } public void close() { @@ -223,7 +221,6 @@ public class PeerActions { } } else { // disconnect the peer anyway - if (!this.seedDB.hasDisconnected(ASCII.getBytes(peer.hash))) { this.disconnects++; } peer.put(Seed.DCT, Long.toString(System.currentTimeMillis())); this.seedDB.addDisconnected(peer); } @@ -244,7 +241,6 @@ public class PeerActions { // we do this if we did not get contact with the other peer if (Network.log.isFine()) Network.log.fine("connect: no contact to a " + peer.get(Seed.PEERTYPE, Seed.PEERTYPE_VIRGIN) + " peer '" + peer.getName() + "' at " + peer.getIPs() + ". Cause: " + cause); synchronized (this.seedDB) { - if (!this.seedDB.hasDisconnected(ASCII.getBytes(peer.hash))) { this.disconnects++; } peer.put(Seed.DCT, Long.toString(System.currentTimeMillis())); this.seedDB.addDisconnected(peer); // update info }