From 3288c19c1a19b5100cf666f2808e4e707aa599a7 Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 8 Sep 2008 09:49:08 +0000 Subject: [PATCH] reduce remote crawl PPM for fresh peers in freeworld to 6 PPM git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5124 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- defaults/yacy.init | 2 -- defaults/yacy.network.freeworld.unit | 3 ++- defaults/yacy.network.group | 10 +++++----- defaults/yacy.network.intranet.unit | 3 ++- defaults/yacy.network.readme | 12 ++++++------ defaults/yacy.network.webportal.unit | 3 ++- source/de/anomic/plasma/plasmaSwitchboard.java | 9 +++++++++ source/de/anomic/server/serverAbstractSwitch.java | 2 ++ 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/defaults/yacy.init b/defaults/yacy.init index 8fa709869..dc6bd3877 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -559,9 +559,7 @@ performanceSpeed=100 50_localcrawl_memprereq=4194304 50_localcrawl_isPaused=false 60_remotecrawlloader_idlesleep=60000 -60_remotecrawlloader_idlesleep__pro=10000 60_remotecrawlloader_busysleep=40000 -60_remotecrawlloader_busysleep__pro=2000 60_remotecrawlloader_memprereq=2097152 60_remotecrawlloader_isPaused=false 62_remotetriggeredcrawl_idlesleep=10000 diff --git a/defaults/yacy.network.freeworld.unit b/defaults/yacy.network.freeworld.unit index 3244ccf3e..d48becf50 100644 --- a/defaults/yacy.network.freeworld.unit +++ b/defaults/yacy.network.freeworld.unit @@ -14,6 +14,7 @@ network.unit.search.time = 4 network.unit.dht = true network.unit.dhtredundancy.junior = 1 network.unit.dhtredundancy.senior = 3 +network.unit.remotecrawl.speed = 10 network.unit.bootstrap.seedlist0 = http://www.yacy.net/seed.txt network.unit.bootstrap.seedlist1 = http://home.arcor.de/hermens/yacy/seed.txt network.unit.bootstrap.seedlist2 = http://low.audioattack.de/yacy/seed.txt @@ -26,5 +27,5 @@ network.unit.update.location1 = http://latest.yacy.de network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php network.unit.update.location3 = http://www.yacystats.de/yacybuild/ -# properties for in-protocol response authentification: +# properties for in-protocol response authentication: network.unit.protocol.control = uncontrolled \ No newline at end of file diff --git a/defaults/yacy.network.group b/defaults/yacy.network.group index f5a6698fe..47455c9e1 100644 --- a/defaults/yacy.network.group +++ b/defaults/yacy.network.group @@ -13,17 +13,17 @@ # network.group.description = # network.group.administration.control = 'uncontrolled'|'moderated'|'controlled' # network.group.administration.manager = -# network.group.administration.request.authentification.method = 'salted-magic' -# network.group.administration.request.authentification.essentials = +# network.group.administration.request.authentication.method = 'salted-magic' +# network.group.administration.request.authentication.essentials = # -----------------------------------------------------------------# # this is a work in progress. disabled properties are not yet used # # -----------------------------------------------------------------# -# properties for group access administrator-authentification: +# properties for group access administrator-authentication: #network.group.name = everybody #network.group.description = Our Peer-Group #network.group.administration.control = uncontrolled #network.group.administration.manager = -#network.group.administration.request.authentification.method = salted-magic -#network.group.administration.request.authentification.essentials = \ No newline at end of file +#network.group.administration.request.authentication.method = salted-magic +#network.group.administration.request.authentication.essentials = \ No newline at end of file diff --git a/defaults/yacy.network.intranet.unit b/defaults/yacy.network.intranet.unit index 5ef5d5220..947c360e4 100644 --- a/defaults/yacy.network.intranet.unit +++ b/defaults/yacy.network.intranet.unit @@ -13,6 +13,7 @@ network.unit.domain = local network.unit.dht = false network.unit.dhtredundancy.junior = 1 network.unit.dhtredundancy.senior = 1 +network.unit.remotecrawl.speed = 600 # each network may use different yacy distributions. # the auto-updater can access network-specific update locations @@ -21,5 +22,5 @@ network.unit.update.location1 = http://latest.yacy.de network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php network.unit.update.location3 = http://www.yacystats.de/yacybuild/ -# properties for in-protocol response authentification: +# properties for in-protocol response authentication: network.unit.protocol.control = uncontrolled \ No newline at end of file diff --git a/defaults/yacy.network.readme b/defaults/yacy.network.readme index eda000c3d..dd97be776 100644 --- a/defaults/yacy.network.readme +++ b/defaults/yacy.network.readme @@ -34,11 +34,11 @@ # network.unit.dhtredundancy = # network.unit.bootstrap.seedlist = # network.unit.protocol.control = 'uncontrolled'|'moderated'|'controlled' -# network.unit.protocol.request.authentification.method = 'salted-magic' -# network.unit.protocol.request.authentification.essentials = -# network.unit.protocol.response.authentification.method = 'challenge-pwresponse' -# network.unit.protocol.response.authentification.essentials = ':' +# network.unit.protocol.request.authentication.method = 'salted-magic' +# network.unit.protocol.request.authentication.essentials = +# network.unit.protocol.response.authentication.method = 'challenge-pwresponse' +# network.unit.protocol.response.authentication.essentials = ':' # network.unit.administration.control = 'uncontrolled'|'moderated'|'controlled' # network.unit.administration.manager = -# network.unit.administration.request.authentification.method = 'salted-magic' -# network.unit.administration.request.authentification.essentials = +# network.unit.administration.request.authentication.method = 'salted-magic' +# network.unit.administration.request.authentication.essentials = diff --git a/defaults/yacy.network.webportal.unit b/defaults/yacy.network.webportal.unit index 5180de255..943b2a652 100644 --- a/defaults/yacy.network.webportal.unit +++ b/defaults/yacy.network.webportal.unit @@ -10,6 +10,7 @@ network.unit.search.time = 4 network.unit.dht = false network.unit.dhtredundancy.junior = 1 network.unit.dhtredundancy.senior = 1 +network.unit.remotecrawl.speed = 1 # each network may use different yacy distributions. # the auto-updater can access network-specific update locations @@ -18,5 +19,5 @@ network.unit.update.location1 = http://latest.yacy.de network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php network.unit.update.location3 = http://www.yacystats.de/yacybuild/ -# properties for in-protocol response authentification: +# properties for in-protocol response authentication: network.unit.protocol.control = uncontrolled \ No newline at end of file diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index c11f45bf8..d3f634e35 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -298,6 +298,15 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements serverSwitch { private final File configFile; private final String configComment; private final File rootPath; + protected boolean firstInit; protected serverLog log; protected int serverJobs; protected long maxTrackingTime; @@ -64,6 +65,7 @@ public abstract class serverAbstractSwitch implements serverSwitch { this.configComment = "This is an automatically generated file, updated by serverAbstractSwitch and initialized by " + initPath; final File initFile = new File(rootPath, initPath); this.configFile = new File(rootPath, configPath); // propertiesFile(config); + firstInit = !configFile.exists(); // this is true if the application was started for the first time new File(configFile.getParent()).mkdir(); // predefine init's