From ca79362b9d924ad8d70bf7589e71b71982b0f20f Mon Sep 17 00:00:00 2001 From: orbiter Date: Wed, 18 Apr 2007 18:36:06 +0000 Subject: [PATCH] disabling auto-setting of remote crawl performance see also http://www.yacy-forum.de/viewtopic.php?t=3849 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3577 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/IndexCreate_p.java | 6 +++--- source/de/anomic/plasma/plasmaSwitchboard.java | 6 +++--- source/de/anomic/soap/services/AdminService.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htroot/IndexCreate_p.java b/htroot/IndexCreate_p.java index f24e98db6..38ceaae2d 100644 --- a/htroot/IndexCreate_p.java +++ b/htroot/IndexCreate_p.java @@ -70,7 +70,7 @@ public class IndexCreate_p { if (post != null) { if (post.containsKey("distributedcrawling")) { - long newBusySleep = Integer.parseInt(env.getConfig("62_remotetriggeredcrawl_busysleep", "100")); + long newBusySleep = Integer.parseInt(env.getConfig(plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, "100")); if (post.get("dcr", "").equals("acceptCrawlMax")) { env.setConfig("crawlResponse", "true"); newBusySleep = 100; @@ -83,9 +83,9 @@ public class IndexCreate_p { } else if (post.get("dcr", "").equals("acceptCrawlDenied")) { env.setConfig("crawlResponse", "false"); } - serverThread rct = switchboard.getThread("62_remotetriggeredcrawl"); + serverThread rct = switchboard.getThread(plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL); rct.setBusySleep(newBusySleep); - env.setConfig("62_remotetriggeredcrawl_busysleep", Long.toString(newBusySleep)); + env.setConfig(plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, Long.toString(newBusySleep)); //boolean crawlResponse = ((String) post.get("acceptCrawlMax", "")).equals("on"); //env.setConfig("crawlResponse", (crawlResponse) ? "true" : "false"); } diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index c32c8a95b..99b5c2dc5 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -2979,9 +2979,9 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser setConfig(CRAWLJOB_GLOBAL_CRAWL_TRIGGER_BUSYSLEEP , thread.setBusySleep(Math.max(1000, newBusySleep * 3))); thread.setIdleSleep(10000); - thread = getThread(CRAWLJOB_REMOTE_TRIGGERED_CRAWL); - setConfig(CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP , thread.setBusySleep(newBusySleep * 10)); - thread.setIdleSleep(10000); + //thread = getThread(CRAWLJOB_REMOTE_TRIGGERED_CRAWL); + //setConfig(CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP , thread.setBusySleep(newBusySleep * 10)); + //thread.setIdleSleep(10000); thread = getThread(PROXY_CACHE_ENQUEUE); setConfig(PROXY_CACHE_ENQUEUE_BUSYSLEEP , thread.setBusySleep(0)); diff --git a/source/de/anomic/soap/services/AdminService.java b/source/de/anomic/soap/services/AdminService.java index 5b76f9b58..5b9694c95 100644 --- a/source/de/anomic/soap/services/AdminService.java +++ b/source/de/anomic/soap/services/AdminService.java @@ -98,8 +98,8 @@ public class AdminService extends AbstractService { // remote triggered crawl properties private static final String CRAWL_RESPONSE = "crawlResponse"; - private static final String _62_REMOTETRIGGEREDCRAWL_BUSYSLEEP = "62_remotetriggeredcrawl_busysleep"; - private static final String _62_REMOTETRIGGEREDCRAWL = "62_remotetriggeredcrawl"; + private static final String _62_REMOTETRIGGEREDCRAWL_BUSYSLEEP = plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP; + private static final String _62_REMOTETRIGGEREDCRAWL = plasmaSwitchboard.CRAWLJOB_REMOTE_TRIGGERED_CRAWL; // index transfer properties private static final String INDEX_RECEIVE_BLOCK_BLACKLIST = "indexReceiveBlockBlacklist";