implemented online caution also for local and remote search

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

htroot/index.java

@@ -147,7 +147,10 @@ public class index {
         prop.put("contentdomCheckVideo", (contentdom == plasmaSearchQuery.CONTENTDOM_VIDEO) ? "1" : "0");
         prop.put("contentdomCheckImage", (contentdom == plasmaSearchQuery.CONTENTDOM_IMAGE) ? "1" : "0");
         prop.put("contentdomCheckApp", (contentdom == plasmaSearchQuery.CONTENTDOM_APP) ? "1" : "0");
-
+        
+        // online caution timing
+        sb.localSearchLastAccess = System.currentTimeMillis();
+        
         return prop;
     }
 }

htroot/yacy/search.java

@@ -59,6 +59,8 @@ public final class search {
     public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
         // return variable that accumulates replacements
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
+        sb.remoteSearchLastAccess = System.currentTimeMillis();
+        
         serverObjects prop = new serverObjects();
         if ((post == null) || (env == null)) return prop;
         if (!yacyNetwork.authentifyRequest(post, env)) return prop;

htroot/yacysearch.java

@@ -73,7 +73,8 @@ public class yacysearch {
 
     public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
-
+        sb.localSearchLastAccess = System.currentTimeMillis();
+        
         boolean searchAllowed = sb.getConfigBool("publicSearchpage", true) || sb.verifyAuthentication(header, false);
         
         boolean authenticated = sb.adminAuthenticated(header) >= 2;
@@ -406,6 +407,8 @@ public class yacysearch {
         // for RSS: don't HTML encode some elements
         prop.putHTML("rss_query", querystring, true);
         prop.put("rss_queryenc", yacyURL.escape(querystring.replace(' ', '+')));
+
+        sb.localSearchLastAccess = System.currentTimeMillis();
         
         // return rewrite properties
         return prop;

source/de/anomic/plasma/plasmaSwitchboard.java

@@ -220,7 +220,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
     public  HashMap                     outgoingCookies, incomingCookies;
     public  kelondroMapTable            facilityDB;
     public  plasmaParser                parser;
-    public  long                        proxyLastAccess;
+    public  long                        proxyLastAccess, localSearchLastAccess, remoteSearchLastAccess;
     public  yacyCore                    yc;
     public  HashMap                     indexingTasksInProcess;
     public  userDB                      userDB;
@@ -562,7 +562,9 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
      * <p><code>public static final String <strong>PROXY_ONLINE_CAUTION_DELAY</strong> = "onlineCautionDelay"</code></p>
      * <p>Name of the setting how long indexing should pause after the last time the proxy was used in milliseconds</p> 
      */
-    public static final String PROXY_ONLINE_CAUTION_DELAY       = "onlineCautionDelay";
+    public static final String PROXY_ONLINE_CAUTION_DELAY        = "crawlPause.proxy";
+    public static final String LOCALSEACH_ONLINE_CAUTION_DELAY   = "crawlPause.localsearch";
+    public static final String REMOTESEARCH_ONLINE_CAUTION_DELAY = "crawlPause.remotesearch";
     /**
      * <p><code>public static final String <strong>PROXY_PREFETCH_DEPTH</strong> = "proxyPrefetchDepth"</code></p>
      * <p>Name of the setting how deep URLs fetched by proxy usage shall be followed</p>
@@ -971,6 +973,8 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
         
         // setting timestamp of last proxy access
         this.proxyLastAccess = System.currentTimeMillis() - 60000;
+        this.localSearchLastAccess = System.currentTimeMillis() - 60000;
+        this.remoteSearchLastAccess = System.currentTimeMillis() - 60000;
         this.webStructure = new plasmaWebStructure(log, rankingPath, "LOCAL/010_cr/", getConfig("CRDist0Path", plasmaRankingDistribution.CR_OWN), new File(plasmaPath, "webStructure.map"));
         
         // configuring list path
@@ -1507,11 +1511,10 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser
     }
     
     public boolean onlineCaution() {
-        try {
+        return
-            return System.currentTimeMillis() - proxyLastAccess < Integer.parseInt(getConfig(PROXY_ONLINE_CAUTION_DELAY, "30000"));
+           (System.currentTimeMillis() - this.proxyLastAccess < Integer.parseInt(getConfig(PROXY_ONLINE_CAUTION_DELAY, "30000"))) ||
-        } catch (NumberFormatException e) {
+           (System.currentTimeMillis() - this.localSearchLastAccess < Integer.parseInt(getConfig(LOCALSEACH_ONLINE_CAUTION_DELAY, "30000"))) ||
-            return false;
+           (System.currentTimeMillis() - this.remoteSearchLastAccess < Integer.parseInt(getConfig(REMOTESEARCH_ONLINE_CAUTION_DELAY, "30000")));
-        }
     }
     
     private static String ppRamString(long bytes) {

yacy.init

@@ -714,8 +714,10 @@ msgForwardingEnabled=false
 msgForwardingCmd=/usr/sbin/sendmail
 msgForwardingTo=root@localhost
 
-#onlineCautionDelay: delay time after proxy usage before crawling is resumed
+#crawlPause: delay time after specific functions before crawling is resumed
-onlineCautionDelay=10000
+crawlPause.proxy=15000
+crawlPause.localsearch=9000
+crawlPause.remotesearch=3000
 
 # Some configuration values for the crawler
 crawler.clientTimeout=9000