svn commit: r1647602 - in /nutch/branches/2.x: CHANGES.txt src/java/org/apache/nutch/crawl/GeneratorMapper.java

[sn...@apache.org]

Author: snagel
Date: Tue Dec 23 16:01:57 2014
New Revision: 1647602

URL: http://svn.apache.org/r1647602
Log:
NUTCH-1834 GeneratorMapper behavior depends on log level

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/src/java/org/apache/nutch/crawl/GeneratorMapper.java

Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1647602&r1=1647601&r2=1647602&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Tue Dec 23 16:01:57 2014
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Current Development 2.3-SNAPSHOT
 
+* NUTCH-1834 GeneratorMapper behavior depends on log level (Gerhard Gossen via snagel)
+
 * NUTCH-1899 upgrade restlet lib to prevent build failure (talat)
 
 * NUTCH-1797 remove unused package o.a.n.html (Saurabh Chhajed via snagel)

Modified: nutch/branches/2.x/src/java/org/apache/nutch/crawl/GeneratorMapper.java
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/crawl/GeneratorMapper.java?rev=1647602&r1=1647601&r2=1647602&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/crawl/GeneratorMapper.java (original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/crawl/GeneratorMapper.java Tue Dec 23 16:01:57 2014
@@ -53,9 +53,7 @@ extends GoraMapper<String, WebPage, Sele
     String url = TableUtil.unreverseUrl(reversedUrl);
 
     if (Mark.GENERATE_MARK.checkMark(page) != null) {
-      if (GeneratorJob.LOG.isDebugEnabled()) {
-        GeneratorJob.LOG.debug("Skipping " + url + "; already generated");
-      }
+      GeneratorJob.LOG.debug("Skipping {}; already generated", url);
       return;
     }
 
@@ -78,15 +76,11 @@ extends GoraMapper<String, WebPage, Sele
       if (filter && filters.filter(url) == null)
         return;
     } catch (URLFilterException e) {
-      if (GeneratorJob.LOG.isWarnEnabled()) {
-        GeneratorJob.LOG.warn("Couldn't filter url: " + url + " (" + e.getMessage() + ")");
-        return;
-      }
+      GeneratorJob.LOG.warn("Couldn't filter url: {} ({})", url, e.getMessage());
+      return;
     } catch (MalformedURLException e) {
-      if (GeneratorJob.LOG.isWarnEnabled()) {
-        GeneratorJob.LOG.warn("Couldn't filter url: " + url + " (" + e.getMessage() +")");
-        return;
-      }
+      GeneratorJob.LOG.warn("Couldn't filter url: {} ({})", url, e.getMessage());
+      return;
     }
 
     // check fetch schedule