diff --git a/.classpath b/.classpath index ef5987ea8..ab449ee54 100644 --- a/.classpath +++ b/.classpath @@ -92,7 +92,7 @@ - + diff --git a/build.xml b/build.xml index 421549918..a487ca4d7 100644 --- a/build.xml +++ b/build.xml @@ -242,7 +242,7 @@ - + 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/lib/weupnp-0.1.3.jar b/lib/weupnp-0.1.3.jar deleted file mode 100644 index b728e879d..000000000 Binary files a/lib/weupnp-0.1.3.jar and /dev/null differ diff --git a/lib/weupnp-0.1.4.jar b/lib/weupnp-0.1.4.jar new file mode 100644 index 000000000..a03b9e212 Binary files /dev/null and b/lib/weupnp-0.1.4.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 29214a076..afba26ba1 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -83,7 +83,7 @@ source htroot - lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.11.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.1.jar;lib/lucene-analyzers-phonetic-5.4.1.jar;lib/lucene-backward-codecs-5.4.1.jar;lib/lucene-classification-5.4.1.jar;lib/lucene-codecs-5.4.1.jar;lib/lucene-core-5.4.1.jar;lib/lucene-facet-5.4.1.jar;lib/lucene-grouping-5.4.1.jar;lib/lucene-highlighter-5.4.1.jar;lib/lucene-join-5.4.1.jar;lib/lucene-memory-5.4.1.jar;lib/lucene-misc-5.4.1.jar;lib/lucene-queries-5.4.1.jar;lib/lucene-queryparser-5.4.1.jar;lib/lucene-spatial-5.4.1.jar;lib/lucene-suggest-5.4.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.11.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.1.jar;lib/solr-solrj-5.4.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar + lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.11.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.1.jar;lib/lucene-analyzers-phonetic-5.4.1.jar;lib/lucene-backward-codecs-5.4.1.jar;lib/lucene-classification-5.4.1.jar;lib/lucene-codecs-5.4.1.jar;lib/lucene-core-5.4.1.jar;lib/lucene-facet-5.4.1.jar;lib/lucene-grouping-5.4.1.jar;lib/lucene-highlighter-5.4.1.jar;lib/lucene-join-5.4.1.jar;lib/lucene-memory-5.4.1.jar;lib/lucene-misc-5.4.1.jar;lib/lucene-queries-5.4.1.jar;lib/lucene-queryparser-5.4.1.jar;lib/lucene-spatial-5.4.1.jar;lib/lucene-suggest-5.4.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.11.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.1.jar;lib/solr-solrj-5.4.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.4.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar lib/yacycore.jar 1.7 diff --git a/pom.xml b/pom.xml index d5eabd974..dad54bca9 100644 --- a/pom.xml +++ b/pom.xml @@ -606,7 +606,7 @@ org.bitlet weupnp - 0.1.3 + 0.1.4 xerces 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 }