diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html index d8c21ecbb..3c44b8b34 100644 --- a/htroot/PerformanceMemory_p.html +++ b/htroot/PerformanceMemory_p.html @@ -76,19 +76,15 @@ Table Chunk Size - RO Count - RO Used Memory - RW Count - RW Used Memory + Count + Used Memory #{TableList}# #[tableIndexPath]# #[tableIndexChunkSize]# - #[tableROIndexCount]# - #[tableROIndexMem]# MB - #[tableRWIndexCount]# - #[tableRWIndexMem]# MB + #[tableIndexCount]# + #[tableIndexMem]# MB #{/TableList}# diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 6b6adf1f4..cff52a3fb 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -116,20 +116,16 @@ public class PerformanceMemory_p { String filename; Map map; int p, c = 0; - long ROmem, RWmem, totalmem = 0; + long mem, totalmem = 0; while (i.hasNext()) { filename = (String) i.next(); map = (Map) kelondroFlexTable.memoryStats(filename); - ROmem = Long.parseLong((String) map.get("tableROIndexMem")); - RWmem = Long.parseLong((String) map.get("tableRWIndexMem")); - totalmem += ROmem; - totalmem += RWmem; + mem = Long.parseLong((String) map.get("tableIndexMem")); + totalmem += mem; prop.put("TableList_" + c + "_tableIndexPath", ((p = filename.indexOf("DATA")) < 0) ? filename : filename.substring(p)); prop.put("TableList_" + c + "_tableIndexChunkSize", map.get("tableIndexChunkSize")); - prop.put("TableList_" + c + "_tableROIndexCount", map.get("tableROIndexCount")); - prop.put("TableList_" + c + "_tableROIndexMem", ROmem / (1024 * 1024)); - prop.put("TableList_" + c + "_tableRWIndexCount", map.get("tableRWIndexCount")); - prop.put("TableList_" + c + "_tableRWIndexMem", RWmem / (1024 * 1024)); + prop.put("TableList_" + c + "_tableIndexCount", map.get("tableIndexCount")); + prop.put("TableList_" + c + "_tableIndexMem", map.get("tableIndexCount")); c++; } prop.put("TableList", c); @@ -139,7 +135,6 @@ public class PerformanceMemory_p { i = kelondroRecords.filenames(); c = 0; totalmem = 0; - long mem; while (i.hasNext()) { filename = (String) i.next(); map = (Map) kelondroRecords.memoryStats(filename); diff --git a/superseed.txt b/superseed.txt index ff6b24535..974805e68 100644 --- a/superseed.txt +++ b/superseed.txt @@ -5,7 +5,6 @@ http://home.arcor.de/hermens/yacy/seed.txt http://low.audioattack.de/yacy/seed.txt http://sam-daheim.de/seed.txt http://thq.homeip.net/share/seed.txt -http://www.anomic.de/yacy/seed.txt http://www.dortmund.homelinux.org/~samba/yacy/seed.txt http://www.lulabad.de/seed.txt http://www.suma-lab.de/yacy/seed.txt diff --git a/yacy.init b/yacy.init index 8ab2b8b89..8879d4e61 100644 --- a/yacy.init +++ b/yacy.init @@ -83,6 +83,24 @@ pkcs12ImportPwd = superseedFile=superseed.txt superseedLocation=http://www.yacy.net/superseed.txt + + +# network definition +# we distiguish local and global networks. Each network type can have different user groups +# groups can be uncontrolled, moderated or controlled +# Each group has a group master, but in case the group is uncontrolled the only task of the +# group master is to provide a bootstrap file which contains peer addresses of peers that +# are member of the group. All attributes are given in a single network description string +# of the form: +# network = :::{'uncontrolled'|'moderated'|'controlled'}: +# in case that the network is the uncontrolled global dht-managed community for everybody, +# the details defaults to: +# network = all:world:global:uncontrolled:http://yacy.net/ +# the network-uri must have a sub-path yacy/seed.txt containing a list of urls pointing to the +# peer-address of peers within the group of that network +# several network definition strings can be listed in a single + + # bootstrapLoadTimeout # this is the time-out for loading of the seedlist files during bootstraping # the time should not be too long, since loading of the seedlist is not parallelized