removed some unnecessary pause delays

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

build.properties

@@ -3,7 +3,7 @@ javacSource=1.5
 javacTarget=1.5
 
 # Release Configuration
-releaseVersion=0.613
+releaseVersion=0.614
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz

htroot/Steering.java

@@ -52,7 +52,7 @@ public class Steering {
         }
 
         if (post.containsKey("shutdown")) {
-            sb.terminate(5000);
+            sb.terminate(100);
             prop.put("info", "3");
             
             return prop;

source/de/anomic/index/indexRepositoryReference.java

@@ -219,7 +219,7 @@ public final class indexRepositoryReference {
                     log.logSevere("RuntimeException:", e);
                 }
             }
-            try { Thread.sleep(1000); } catch (final InterruptedException e) { }
+            //try { Thread.sleep(1000); } catch (final InterruptedException e) { }
             log.logInfo("URLs vorher: " + urlIndexFile.size() + " Entries loaded during Iteratorloop: " + iteratorCount + " kaputte URLs: " + damagedURLS.size());
 
             final Iterator<String> eiter2 = damagedURLS.iterator();

source/de/anomic/plasma/plasmaSwitchboard.java

@@ -519,23 +519,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
         rankingOn = getConfig(plasmaSwitchboardConstants.RANKING_DIST_ON, "true").equals("true") && networkName.equals("freeworld");
         rankingOwnDistribution = new plasmaRankingDistribution(log, webIndex.seedDB, new File(rankingPath, getConfig(plasmaSwitchboardConstants.RANKING_DIST_0_PATH, plasmaRankingDistribution.CR_OWN)), (int) getConfigLong(plasmaSwitchboardConstants.RANKING_DIST_0_METHOD, plasmaRankingDistribution.METHOD_ANYSENIOR), (int) getConfigLong(plasmaSwitchboardConstants.RANKING_DIST_0_METHOD, 0), getConfig(plasmaSwitchboardConstants.RANKING_DIST_0_TARGET, ""));
         rankingOtherDistribution = new plasmaRankingDistribution(log, webIndex.seedDB, new File(rankingPath, getConfig(plasmaSwitchboardConstants.RANKING_DIST_1_PATH, plasmaRankingDistribution.CR_OTHER)), (int) getConfigLong(plasmaSwitchboardConstants.RANKING_DIST_1_METHOD, plasmaRankingDistribution.METHOD_MIXEDSENIOR), (int) getConfigLong(plasmaSwitchboardConstants.RANKING_DIST_1_METHOD, 30), getConfig(plasmaSwitchboardConstants.RANKING_DIST_1_TARGET, "kaskelix.de:8080,yacy.dyndns.org:8000"));
-        
-        // init facility DB
-        /*
-        log.logSystem("Starting Facility Database");
-        File facilityDBpath = new File(getRootPath(), "DATA/SETTINGS/");
-        facilityDB = new kelondroTables(facilityDBpath);
-        facilityDB.declareMaps("backlinks", 250, 500, new String[] {"date"}, null);
-        log.logSystem("..opened backlinks");
-        facilityDB.declareMaps("zeitgeist",  40, 500);
-        log.logSystem("..opened zeitgeist");
-        facilityDB.declareTree("statistik", new int[]{11, 8, 8, 8, 8, 8, 8}, 0x400);
-        log.logSystem("..opened statistik");
-        facilityDB.update("statistik", (new serverDate()).toShortString(false).substring(0, 11), new long[]{1,2,3,4,5,6});
-        long[] testresult = facilityDB.selectLong("statistik", "yyyyMMddHHm");
-        testresult = facilityDB.selectLong("statistik", (new serverDate()).toShortString(false).substring(0, 11));
-         */
-        
+
         // init nameCacheNoCachingList
         final String noCachingList = getConfig(plasmaSwitchboardConstants.HTTPC_NAME_CACHE_CACHING_PATTERNS_NO,"");
         final String[] noCachingEntries = noCachingList.split(",");

source/de/anomic/server/serverCore.java

@@ -644,7 +644,7 @@ public final class serverCore extends serverAbstractBusyThread implements server
                     this.out.close();                   
                     
                     // sleep for a while
-                    try {Thread.sleep(1000);} catch (final InterruptedException e) {}                                                           
+                    //try {Thread.sleep(500);} catch (final InterruptedException e) {}                                                           
                     
                     // close everything                    
                     this.controlSocket.close();

source/yacy.java

@@ -440,7 +440,7 @@ public final class yacy {
                     
                     // idle until the processes are down
                     if (server.isAlive()) {
-                        Thread.sleep(2000); // wait a while
+                        //Thread.sleep(2000); // wait a while
                         server.interrupt();
                         MultiThreadedHttpConnectionManager.shutdownAll();
                     }