maintenance

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@279 6c8d7289-2bf4-0310-a012-ef5d649a1542

build.properties

@@ -3,7 +3,7 @@ javacSource=1.4
 javacTarget=1.4
 
 # Release Configuration
-releaseVersion=0.381
+releaseVersion=0.382
 releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}

htroot/Status.html

@@ -107,12 +107,14 @@ you must switch off the proxy to go off-line.
 #(/omode)#
 </td></tr>
 <tr class="TableCellDark"><td>Memory Usage</td><td>
-free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#
+<form action="Status.html" method="get">free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# | <input type="submit" name="gc" value="do Garbage-Collect now"></form>
 </td></tr>
-
 <tr class="TableCellLight"><td>Traffic</td><td>
 In: #[trafficIn]# | Out: #[trafficOut]#
 </td></tr>
+<tr class="TableCellDark"><td>System Resources</td><td>
+processors: #[processors]#
+</td></tr>
 
 </table>
 <!-- </td></tr></table> -->

htroot/Status.java

@@ -150,10 +150,13 @@ public class Status {
             prop.put("otherPeers", 0);//not online
         }
         
-	// pop-up trigger management
+        Runtime rt = Runtime.getRuntime();
+
+        // pop-up trigger management and gc
         if (post != null) {
             if (post.containsKey("dispop")) env.setConfig("browserPopUpTrigger", "false");
             if (post.containsKey("enpop")) env.setConfig("browserPopUpTrigger", "true");
+            if (post.containsKey("gc")) rt.gc();
         }
         
         if (env.getConfig("browserPopUpTrigger", "false").equals("false")) {
@@ -168,11 +171,11 @@ public class Status {
             prop.put("omode", 2);
         }
         
-    // memory usage
-    Runtime rt = Runtime.getRuntime();
+        // memory usage and system attributes
         prop.put("freeMemory", bytesToString(rt.freeMemory()));
         prop.put("totalMemory", bytesToString(rt.totalMemory()));
         prop.put("maxMemory", bytesToString(rt.maxMemory()));
+        prop.put("processors", rt.availableProcessors());
         
         // proxy traffic
         prop.put("trafficIn",bytesToString(httpdByteCountInputStream.getGlobalCount()));

source/yacy.java

@@ -469,10 +469,14 @@ public final class yacy {
     }
 
     private static void checkMigrate(File dbroot, serverLog log, File file, plasmaWordIndex wordIndex) throws IOException {
+        long length = file.length();
+        if (length > 3000) {
+            log.logInfo("SKIPPED  " + file.toString() + ": too big, size=" + (length / 1024) + "kb");
+            return;
+        }
         kelondroTree db = new kelondroTree(file, 0);
         String wordhash = file.getName().substring(0, 12);
         int size = db.size();
-        long length = file.length();
         db.close();
         if (size <= 50) {
             plasmaWordIndexEntryContainer container = new plasmaWordIndexEntryContainer(wordhash);