diff options
| -rw-r--r-- | defaults/yacy.init | 2 | ||||
| -rw-r--r-- | defaults/yacy.network.freeworld.unit | 3 | ||||
| -rw-r--r-- | defaults/yacy.network.group | 10 | ||||
| -rw-r--r-- | defaults/yacy.network.intranet.unit | 3 | ||||
| -rw-r--r-- | defaults/yacy.network.readme | 12 | ||||
| -rw-r--r-- | defaults/yacy.network.webportal.unit | 3 | ||||
| -rw-r--r-- | source/de/anomic/plasma/plasmaSwitchboard.java | 9 | ||||
| -rw-r--r-- | 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 = <any string, just informal; appears in network graphic> # network.group.administration.control = 'uncontrolled'|'moderated'|'controlled' # network.group.administration.manager = <a .yacy or .yacyh - domain, naming the manager peer> -# network.group.administration.request.authentification.method = 'salted-magic' -# network.group.administration.request.authentification.essentials = <any string, a secret password> +# network.group.administration.request.authentication.method = 'salted-magic' +# network.group.administration.request.authentication.essentials = <any string, a secret password> # -----------------------------------------------------------------# # 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 = <integer number, 0 means no DHT enabled> # network.unit.bootstrap.seedlist<n> = <an url to a seedlists-file, which is stored by a principal peer> # network.unit.protocol.control = 'uncontrolled'|'moderated'|'controlled' -# network.unit.protocol.request.authentification.method = 'salted-magic' -# network.unit.protocol.request.authentification.essentials = <any string, a secret password> -# network.unit.protocol.response.authentification.method = 'challenge-pwresponse' -# network.unit.protocol.response.authentification.essentials = <a challenge string>':'<a secret response-string> +# network.unit.protocol.request.authentication.method = 'salted-magic' +# network.unit.protocol.request.authentication.essentials = <any string, a secret password> +# network.unit.protocol.response.authentication.method = 'challenge-pwresponse' +# network.unit.protocol.response.authentication.essentials = <a challenge string>':'<a secret response-string> # network.unit.administration.control = 'uncontrolled'|'moderated'|'controlled' # network.unit.administration.manager = <a .yacy or .yacyh - domain, naming the manager peer> -# network.unit.administration.request.authentification.method = 'salted-magic' -# network.unit.administration.request.authentification.essentials = <any string, a secret password> +# network.unit.administration.request.authentication.method = 'salted-magic' +# network.unit.administration.request.authentication.essentials = <any string, a secret password> 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<IndexingStack. (int) getConfigLong(plasmaSwitchboardConstants.WORDCACHE_MAX_COUNT, 20000));
setConfig(plasmaSwitchboardConstants.WORDCACHE_MAX_COUNT, Integer.toString(wordCacheMaxCount));
+ // set network-specific performance attributes
+ if (this.firstInit) {
+ int remotecrawl_ppm = Math.max(1, (int) getConfigLong("network.unit.remotecrawl.speed", 60));
+ setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_BUSYSLEEP, 60000 / remotecrawl_ppm);
+ setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL_IDLESLEEP, Math.max(10000, 180000 / remotecrawl_ppm));
+ setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_BUSYSLEEP, Math.max(15000, 1800000 / remotecrawl_ppm));
+ setConfig(plasmaSwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER_IDLESLEEP, Math.max(30000, 3600000 / remotecrawl_ppm));
+ }
+
// start indexing management
log.logConfig("Starting Indexing Management");
final String networkName = getConfig("network.unit.name", "");
diff --git a/source/de/anomic/server/serverAbstractSwitch.java b/source/de/anomic/server/serverAbstractSwitch.java index c309a3ca9..104e0b06a 100644 --- a/source/de/anomic/server/serverAbstractSwitch.java +++ b/source/de/anomic/server/serverAbstractSwitch.java @@ -41,6 +41,7 @@ public abstract class serverAbstractSwitch<E> implements serverSwitch<E> { 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<E> implements serverSwitch<E> { 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
|