Merge remote-tracking branch 'original yacy/master'

build.properties

@@ -3,7 +3,7 @@ javacSource=1.6
 javacTarget=1.6
 
 # Release Configuration
-releaseVersion=1.02
+releaseVersion=1.03
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 releaseFileParentDir=yacy

defaults/yacy.init

@@ -621,7 +621,7 @@ cleanup.failedSearchURLtimeout = 86400000
 # if a high performance for large search indexes is wanted, then setting the values to equal number is recommended
 # if YaCy shall be nice in not-only-yacy environments, then the Xms value may be lower
 javastart_Xmx=Xmx600m
-javastart_Xms=Xms600m
+javastart_Xms=Xms90m
 
 # YaCy is able to use RAM copies of database tables. This needs a lot of RAM.
 # To switch on copying of file tables int RAM, there must be enough memory

htroot/Crawler_p.html

@@ -15,7 +15,7 @@
 #%env/templates/submenuCrawlMonitor.template%#
 <h2>Crawler</h2>
 <noscript><p>(Please enable JavaScript to automatically update this page!)</p></noscript>
-<fieldset style="width:230px;height:140px;float:left;">
+<fieldset style="width:270px;height:140px;float:left;">
 <legend>Queues</legend>
       <table border="0" cellpadding="2" cellspacing="1" class="watchCrawler">
         <tbody>

htroot/PerformanceQueues_p.java

@@ -84,9 +84,9 @@ public class PerformanceQueues_p {
 	            }
         	}
             if (post.containsKey("Xmx")) {
-                int xmx = post.getInt("Xmx", 500); // default maximum heap size
+                int xmx = post.getInt("Xmx", 600); // default maximum heap size
                 if (OS.isWin32) xmx = Math.min(2000, xmx);
-                int xms = xmx; // take all.. if this is not used the os will manage that. if not reserved at the beginning the OS may reject to give away more memory
+                int xms = Math.min(xmx, Math.max(90, xmx / 10));
 	            sb.setConfig("javastart_Xmx", "Xmx" + xmx + "m");
 	            sb.setConfig("javastart_Xms", "Xms" + xms + "m");
 	            prop.put("setStartupCommit", "1");
@@ -342,9 +342,9 @@ public class PerformanceQueues_p {
         prop.put("priority_low",(curr_prio == 20) ? "1" : "0");
 
         // parse initialization memory settings
-        final String Xmx = sb.getConfig("javastart_Xmx", "Xmx500m").substring(3);
+        final String Xmx = sb.getConfig("javastart_Xmx", "Xmx600m").substring(3);
         prop.put("Xmx", Xmx.substring(0, Xmx.length() - 1));
-        final String Xms = sb.getConfig("javastart_Xms", "Xms500m").substring(3);
+        final String Xms = sb.getConfig("javastart_Xms", "Xms90m").substring(3);
         prop.put("Xms", Xms.substring(0, Xms.length() - 1));
 
         final long diskFree = sb.getConfigLong(SwitchboardConstants.DISK_FREE, 3000L);

source/de/anomic/crawler/RobotsTxt.java

@@ -70,7 +70,8 @@ public class RobotsTxt {
         this.syncObjects = new ConcurrentHashMap<String, DomSync>();
         this.tables = worktables;
         try {
-            log.info("initiated robots table: " + this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME).getFile());
+            this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME);
+            //log.info("initiated robots table: " + this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME).getFile());
         } catch (final IOException e) {
             try {
                 this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME).clear();

source/net/yacy/document/TextParser.java

@@ -135,7 +135,7 @@ public final class TextParser {
         if (prototypeMime != null) for (String ext: parser.supportedExtensions()) {
             ext = ext.toLowerCase();
             final String s = ext2mime.get(ext);
-            if (s != null && !s.equals(prototypeMime)) log.logWarning("parser for extension '" + ext + "' was set to mime '" + s + "', overwriting with new mime '" + prototypeMime + "'.");
+            if (s != null && !s.equals(prototypeMime)) Log.logInfo("PARSER", "Parser for extension '" + ext + "' was set to mime '" + s + "', overwriting with new mime '" + prototypeMime + "'.");
             ext2mime.put(ext, prototypeMime);
         }
 

source/net/yacy/kelondro/blob/HeapReader.java

@@ -663,13 +663,7 @@ public class HeapReader {
      * @return the length of the key
      */
     public int keylength() {
-        assert (this.index != null) : "index == null; closeDate=" + this.closeDate + ", now=" + new Date();
-        if (this.index == null) {
-            Log.logSevere("HeapReader", "this.index == null in keylength(); closeDate=" + this.closeDate + ", now=" + new Date() + this.heapFile == null ? "" : (" file = " + this.heapFile.toString()));
-            return 0;
-        }
-        if (this.index == null) return 0;
-        return this.index.row().primaryKeyLength;
+        return this.keylength;
     }
 
     /**

source/net/yacy/peers/SeedDB.java

@@ -164,8 +164,6 @@ public final class SeedDB implements AlternativeDomainNames {
         final String peername = myName();
         this.mySeed = null; // my own seed
         this.myOwnSeedFile = new File(newNetworkRoot, SeedDB.DBFILE_OWN_SEED);
-        initMySeed();
-        this.mySeed.setName(peername);
 
         this.netRedundancy = redundancy;
         this.scheme = new VerticalWordPartitionScheme(partitionExponent);
@@ -175,6 +173,9 @@ public final class SeedDB implements AlternativeDomainNames {
         this.seedPassiveDB = openSeedTable(this.seedPassiveDBFile);
         this.seedPotentialDB = openSeedTable(this.seedPotentialDBFile);
 
+        initMySeed();
+        this.mySeed.setName(peername);
+
         // check if we are in the seedCaches: this can happen if someone else published our seed
         removeMySeed();
 

source/net/yacy/upnp/DiscoveryAdvertisement.java

@@ -250,10 +250,11 @@ public class DiscoveryAdvertisement implements Runnable
             } catch ( SocketTimeoutException ex ) {
                 // ignoring
             } catch ( IOException ioEx ) {
-                log.warn("IO Exception during UPNP DiscoveryAdvertisement messages listening thread");
+                // fail silently
+                //log.warn("IO Exception during UPNP DiscoveryAdvertisement messages listening thread");
             } catch ( Exception ex ) {
-                log
-                    .warn("Fatal Error during UPNP DiscoveryAdvertisement messages listening thread, thread will exit");
+                // fail silently
+                //log.warn("Fatal Error during UPNP DiscoveryAdvertisement messages listening thread, thread will exit");
                 this.inService = false;
                 this.aliveRegistered.clear();
                 this.byeByeRegistered.clear();

startYACY.sh

@@ -73,8 +73,6 @@ for option in $options;do
 				;;
 			-l|--logging) 
 				LOGGING=1
-                # enable asserts
-                JAVA_ARGS="$JAVA_ARGS -ea"
 				if [ $DEBUG -eq 1 ];then
 					echo "can not combine -l and -d"
 					exit 1;