svn commit: r1061815 - in /nutch/branches/branch-1.3: CHANGES.txt src/java/org/apache/nutch/fetcher/Fetcher.java

[jn...@apache.org]

Author: jnioche
Date: Fri Jan 21 14:18:52 2011
New Revision: 1061815

URL: http://svn.apache.org/viewvc?rev=1061815&view=rev
Log:
NUTCH-957 fetcher.timelimit.mins is invalid when depth is greater than 1

Modified:
    nutch/branches/branch-1.3/CHANGES.txt
    nutch/branches/branch-1.3/src/java/org/apache/nutch/fetcher/Fetcher.java

Modified: nutch/branches/branch-1.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.3/CHANGES.txt?rev=1061815&r1=1061814&r2=1061815&view=diff
==============================================================================
--- nutch/branches/branch-1.3/CHANGES.txt (original)
+++ nutch/branches/branch-1.3/CHANGES.txt Fri Jan 21 14:18:52 2011
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Release 1.3 - Current Development
 
+* NUTCH-927 Fetcher.timelimit.mins is invalid when depth is greater than 1 (Wade Lau via jnioche)
+
 * NUTCH-824 Crawling - File Error 404 when fetching file with an hexadecimal character in the file name (Michela Becchi via jnioche)
 
 * NUTCH-954 Strict application of Content-Length limit for http protocols (Alexis Detreglode via jnioche)

Modified: nutch/branches/branch-1.3/src/java/org/apache/nutch/fetcher/Fetcher.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.3/src/java/org/apache/nutch/fetcher/Fetcher.java?rev=1061815&r1=1061814&r2=1061815&view=diff
==============================================================================
--- nutch/branches/branch-1.3/src/java/org/apache/nutch/fetcher/Fetcher.java (original)
+++ nutch/branches/branch-1.3/src/java/org/apache/nutch/fetcher/Fetcher.java Fri Jan 21 14:18:52 2011
@@ -323,7 +323,7 @@ public class Fetcher extends Configured 
       this.byIP = conf.getBoolean("fetcher.threads.per.host.by.ip", false);
       this.crawlDelay = (long) (conf.getFloat("fetcher.server.delay", 1.0f) * 1000);
       this.minCrawlDelay = (long) (conf.getFloat("fetcher.server.min.delay", 0.0f) * 1000);
-      this.timelimit = conf.getLong("fetcher.timelimit.mins", -1);
+      this.timelimit = conf.getLong("fetcher.timelimit", -1);
       this.maxExceptionsPerQueue = conf.getInt("fetcher.max.exceptions.per.queue", -1);
     }
     
@@ -1014,7 +1014,7 @@ public class Fetcher extends Configured 
     //feeder.setPriority((Thread.MAX_PRIORITY + Thread.NORM_PRIORITY) / 2);
     
     // the value of the time limit is either -1 or the time where it should finish
-    long timelimit = getConf().getLong("fetcher.timelimit.mins", -1);
+    long timelimit = getConf().getLong("fetcher.timelimit", -1);
     if (timelimit != -1) feeder.setTimeLimit(timelimit);
     feeder.start();
 
@@ -1081,7 +1081,7 @@ public class Fetcher extends Configured 
     if (timelimit != -1) {
       timelimit = System.currentTimeMillis() + (timelimit * 60 * 1000);
       LOG.info("Fetcher Timelimit set for : " + timelimit);
-      getConf().setLong("fetcher.timelimit.mins", timelimit);
+      getConf().setLong("fetcher.timelimit", timelimit);
     }
         
     JobConf job = new NutchJob(getConf());