diff --git a/htroot/api/latency_p.java b/htroot/api/latency_p.java index 0c9cad043..897fae82c 100644 --- a/htroot/api/latency_p.java +++ b/htroot/api/latency_p.java @@ -26,9 +26,9 @@ import java.util.Iterator; import java.util.Map; import net.yacy.cora.date.GenericFormatter; +import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.RequestHeader; import net.yacy.crawler.data.Latency; -import net.yacy.crawler.data.NoticedURL; import net.yacy.crawler.data.Latency.Host; import net.yacy.server.serverObjects; import net.yacy.server.serverSwitch; @@ -52,7 +52,7 @@ public class latency_p { prop.put("domains_" + c + "_count", host.count()); prop.put("domains_" + c + "_average", host.average()); prop.put("domains_" + c + "_robots", host.robotsDelay()); - prop.put("domains_" + c + "_flux", host.flux(NoticedURL.minimumGlobalDeltaInit)); + prop.put("domains_" + c + "_flux", host.flux(ClientIdentification.minimumGlobalDeltaInit)); c++; } prop.put("domains", c); diff --git a/source/net/yacy/cora/protocol/ClientIdentification.java b/source/net/yacy/cora/protocol/ClientIdentification.java index e846fc1e0..56dcfa480 100644 --- a/source/net/yacy/cora/protocol/ClientIdentification.java +++ b/source/net/yacy/cora/protocol/ClientIdentification.java @@ -28,6 +28,8 @@ package net.yacy.cora.protocol; public class ClientIdentification { public static final int DEFAULT_TIMEOUT = 10000; + public static final int minimumLocalDeltaInit = 10; // the minimum time difference between access of the same local domain + public static final int minimumGlobalDeltaInit = 500; // the minimum time difference between access of the same global domain /** * provide system information (this is part of YaCy protocol) diff --git a/source/net/yacy/crawler/data/NoticedURL.java b/source/net/yacy/crawler/data/NoticedURL.java index e23adcc1a..58b6f1a85 100644 --- a/source/net/yacy/crawler/data/NoticedURL.java +++ b/source/net/yacy/crawler/data/NoticedURL.java @@ -39,6 +39,7 @@ import net.yacy.cora.order.Base64Order; import net.yacy.cora.storage.HandleSet; import net.yacy.cora.util.ConcurrentLog; import net.yacy.cora.util.SpaceExceededException; +import net.yacy.cora.protocol.ClientIdentification; import net.yacy.crawler.Balancer; import net.yacy.crawler.CrawlSwitchboard; import net.yacy.crawler.retrieval.Request; @@ -51,9 +52,6 @@ public class NoticedURL { LOCAL, GLOBAL, REMOTE, NOLOAD; } - private static final int minimumLocalDeltaInit = 10; // the minimum time difference between access of the same local domain - public static final int minimumGlobalDeltaInit = 500; // the minimum time difference between access of the same global domain - private Balancer coreStack; // links found by crawling to depth-1 private Balancer limitStack; // links found by crawling at target depth private Balancer remoteStack; // links from remote crawl orders @@ -65,11 +63,11 @@ public class NoticedURL { final boolean useTailCache, final boolean exceed134217727) { ConcurrentLog.info("NoticedURL", "CREATING STACKS at " + cachePath.toString()); - this.coreStack = new Balancer(cachePath, "urlNoticeCoreStack", minimumLocalDeltaInit, minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); - this.limitStack = new Balancer(cachePath, "urlNoticeLimitStack", minimumLocalDeltaInit, minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); + this.coreStack = new Balancer(cachePath, "urlNoticeCoreStack", ClientIdentification.minimumLocalDeltaInit, ClientIdentification.minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); + this.limitStack = new Balancer(cachePath, "urlNoticeLimitStack", ClientIdentification.minimumLocalDeltaInit, ClientIdentification.minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); //overhangStack = new plasmaCrawlBalancer(overhangStackFile); - this.remoteStack = new Balancer(cachePath, "urlNoticeRemoteStack", minimumLocalDeltaInit, minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); - this.noloadStack = new Balancer(cachePath, "urlNoticeNoLoadStack", minimumLocalDeltaInit, minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); + this.remoteStack = new Balancer(cachePath, "urlNoticeRemoteStack", ClientIdentification.minimumLocalDeltaInit, ClientIdentification.minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); + this.noloadStack = new Balancer(cachePath, "urlNoticeNoLoadStack", ClientIdentification.minimumLocalDeltaInit, ClientIdentification.minimumGlobalDeltaInit, myAgentIDs, useTailCache, exceed134217727); } public int getMinimumLocalDelta() {