You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2012/01/11 18:20:58 UTC
svn commit: r1230158 - in /nutch/branches/nutchgora: ./
src/java/org/apache/nutch/fetcher/ src/java/org/apache/nutch/parse/
src/java/org/apache/nutch/tools/ src/java/org/apache/nutch/util/
src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api...
Author: lewismc
Date: Wed Jan 11 17:20:57 2012
New Revision: 1230158
URL: http://svn.apache.org/viewvc?rev=1230158&view=rev
Log:
commit to address NUTCH-1138 & update to CHANGES.txt
Removed:
nutch/branches/nutchgora/src/java/org/apache/nutch/util/LogUtil.java
Modified:
nutch/branches/nutchgora/CHANGES.txt
nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherReducer.java
nutch/branches/nutchgora/src/java/org/apache/nutch/parse/ParserFactory.java
nutch/branches/nutchgora/src/java/org/apache/nutch/tools/DmozParser.java
nutch/branches/nutchgora/src/java/org/apache/nutch/util/DeflateUtils.java
nutch/branches/nutchgora/src/java/org/apache/nutch/util/DomUtil.java
nutch/branches/nutchgora/src/java/org/apache/nutch/util/EncodingDetector.java
nutch/branches/nutchgora/src/java/org/apache/nutch/util/GZIPUtils.java
nutch/branches/nutchgora/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
nutch/branches/nutchgora/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
nutch/branches/nutchgora/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java
nutch/branches/nutchgora/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
nutch/branches/nutchgora/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
nutch/branches/nutchgora/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
nutch/branches/nutchgora/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
Modified: nutch/branches/nutchgora/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/CHANGES.txt (original)
+++ nutch/branches/nutchgora/CHANGES.txt Wed Jan 11 17:20:57 2012
@@ -2,6 +2,8 @@ Nutch Change Log
Release nutchgora - Current Development
+* NUTCH-1138 remove LogUtil from trunk and nutchgora (lewismc)
+
* NUTCH-1237 Improve javac arguements for more verbose output (lewismc)
* NUTCH-1217 Update NOTICE.txt to drop some copyrights (lewismc)
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherReducer.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherReducer.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherReducer.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/fetcher/FetcherReducer.java Wed Jan 11 17:20:57 2012
@@ -53,7 +53,6 @@ import org.apache.nutch.protocol.RobotRu
import org.apache.nutch.storage.Mark;
import org.apache.nutch.storage.ProtocolStatus;
import org.apache.nutch.storage.WebPage;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.TableUtil;
import org.apache.nutch.util.URLUtil;
import org.apache.gora.mapreduce.GoraReducer;
@@ -542,8 +541,7 @@ extends GoraReducer<IntWritable, FetchEn
} catch (final Throwable t) { // unexpected exception
// unblock
fetchQueues.finishFetchItem(fit);
- logError(fit.url, t.toString());
- t.printStackTrace(LogUtil.getDebugStream(LOG));
+ LOG.error(fit.url, t.toString());
output(fit, null, ProtocolStatusUtils.STATUS_FAILED,
CrawlStatus.STATUS_RETRY);
}
@@ -551,7 +549,6 @@ extends GoraReducer<IntWritable, FetchEn
} catch (final Throwable e) {
LOG.error("fetcher caught:"+e.toString());
- e.printStackTrace(LogUtil.getFatalStream(LOG));
} finally {
if (fit != null) fetchQueues.finishFetchItem(fit);
activeThreads.decrementAndGet(); // count threads
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/parse/ParserFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/parse/ParserFactory.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/parse/ParserFactory.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/parse/ParserFactory.java Wed Jan 11 17:20:57 2012
@@ -31,7 +31,6 @@ import org.apache.nutch.plugin.Extension
import org.apache.nutch.plugin.PluginRepository;
import org.apache.nutch.plugin.PluginRuntimeException;
import org.apache.nutch.storage.WebPage;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.MimeUtil;
import org.apache.nutch.util.ObjectCache;
@@ -132,12 +131,11 @@ public final class ParserFactory {
parsers.add(p);
} catch (PluginRuntimeException e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("ParserFactory:PluginRuntimeException when "
+ "initializing parser plugin "
+ ext.getDescriptor().getPluginId()
+ " instance in getParsers "
- + "function: attempting to continue instantiating parsers");
+ + "function: attempting to continue instantiating parsers: ", e);
}
}
}
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/tools/DmozParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/tools/DmozParser.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/tools/DmozParser.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/tools/DmozParser.java Wed Jan 11 17:20:57 2012
@@ -26,14 +26,12 @@ import org.xml.sax.*;
import org.xml.sax.helpers.*;
import org.apache.xerces.util.XMLChar;
-// Commons Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.io.*;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.conf.Configuration;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
@@ -239,7 +237,6 @@ public class DmozParser {
public void error(SAXParseException spe) {
if (LOG.isErrorEnabled()) {
LOG.error("Error: " + spe.toString() + ": " + spe.getMessage());
- spe.printStackTrace(LogUtil.getFatalStream(LOG));
}
}
@@ -251,7 +248,6 @@ public class DmozParser {
LOG.error("Fatal err: " + spe.toString() + ": " + spe.getMessage());
LOG.error("Last known line is " + location.getLineNumber() +
", column " + location.getColumnNumber());
- spe.printStackTrace(LogUtil.getFatalStream(LOG));
}
}
@@ -261,7 +257,6 @@ public class DmozParser {
public void warning(SAXParseException spe) {
if (LOG.isWarnEnabled()) {
LOG.warn("Warning: " + spe.toString() + ": " + spe.getMessage());
- spe.printStackTrace(LogUtil.getWarnStream(LOG));
}
}
}
@@ -300,8 +295,7 @@ public class DmozParser {
reader.parse(is);
} catch (Exception e) {
if (LOG.isErrorEnabled()) {
- LOG.error(e.toString());
- e.printStackTrace(LogUtil.getFatalStream(LOG));
+ LOG.error("Failed to retieve the InputSource: ", e.toString());
}
System.exit(0);
} finally {
@@ -322,8 +316,7 @@ public class DmozParser {
}
catch (Exception e) {
if (LOG.isErrorEnabled()) {
- LOG.error(e.toString());
- e.printStackTrace(LogUtil.getFatalStream(LOG));
+ LOG.error("Failed with the following exception: ", e.toString());
}
System.exit(0);
} finally {
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/util/DeflateUtils.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/util/DeflateUtils.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/util/DeflateUtils.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/util/DeflateUtils.java Wed Jan 11 17:20:57 2012
@@ -77,8 +77,7 @@ public class DeflateUtils {
outStream.write(buf, 0, size);
written+= size;
} catch (Exception e) {
- LOG.info( "Caught Exception in inflateBestEffort" );
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.info( "Caught Exception in inflateBestEffort", e );
break;
}
}
@@ -128,13 +127,13 @@ public class DeflateUtils {
try {
outStream.write(in);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed to implement outStream.write (input)", e);
}
try {
outStream.close();
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed to implement outStream.close", e);
}
return byteOut.toByteArray();
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/util/DomUtil.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/util/DomUtil.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/util/DomUtil.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/util/DomUtil.java Wed Jan 11 17:20:57 2012
@@ -66,11 +66,11 @@ public class DomUtil {
}
element = (Element)parser.getDocument().getChildNodes().item(i);
} catch (FileNotFoundException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed to find file: ", e);
} catch (SAXException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following SAX exception: ", e);
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following IOException", e);
}
return element;
}
@@ -93,13 +93,13 @@ public class DomUtil {
transformer.transform(source, result);
os.flush();
} catch (UnsupportedEncodingException e1) {
- e1.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following UnsupportedEncodingException: ", e1);
} catch (IOException e1) {
- e1.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed to with the following IOException: ", e1);
} catch (TransformerConfigurationException e2) {
- e2.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following TransformerConfigurationException: ", e2);
} catch (TransformerException ex) {
- ex.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following TransformerException: ", ex);
}
}
}
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/util/EncodingDetector.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/util/EncodingDetector.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/util/EncodingDetector.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/util/EncodingDetector.java Wed Jan 11 17:20:57 2012
@@ -185,8 +185,7 @@ public class EncodingDetector {
matches = detector.detectAll();
}
} catch (Exception e) {
- LOG.debug("Exception from ICU4J (ignoring): ");
- e.printStackTrace(LogUtil.getDebugStream(LOG));
+ LOG.debug("Exception from ICU4J (ignoring): ", e);
}
if (matches != null) {
Modified: nutch/branches/nutchgora/src/java/org/apache/nutch/util/GZIPUtils.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/java/org/apache/nutch/util/GZIPUtils.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/java/org/apache/nutch/util/GZIPUtils.java (original)
+++ nutch/branches/nutchgora/src/java/org/apache/nutch/util/GZIPUtils.java Wed Jan 11 17:20:57 2012
@@ -130,19 +130,19 @@ public class GZIPUtils {
try {
outStream.write(in);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed to get outStream.write input", e);
}
try {
outStream.close();
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed to implement outStream.close", e);
}
return byteOut.toByteArray();
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with IOException", e);
return null;
}
}
Modified: nutch/branches/nutchgora/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java (original)
+++ nutch/branches/nutchgora/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java Wed Jan 11 17:20:57 2012
@@ -36,7 +36,6 @@ import org.apache.nutch.protocol.RobotRu
import org.apache.nutch.storage.WebPage;
import org.apache.nutch.util.GZIPUtils;
import org.apache.nutch.util.DeflateUtils;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.MimeUtil;
/**
@@ -194,7 +193,7 @@ public abstract class HttpBase implement
+ u));
}
} catch (Throwable e) {
- e.printStackTrace(LogUtil.getErrorStream(logger));
+ logger.error("Failed with the following error: ", e);
return new ProtocolOutput(null,
ProtocolStatusUtils.makeStatus(ProtocolStatusCodes.EXCEPTION, e.toString()));
}
Modified: nutch/branches/nutchgora/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java (original)
+++ nutch/branches/nutchgora/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java Wed Jan 11 17:20:57 2012
@@ -52,7 +52,6 @@ import org.apache.nutch.storage.ParseSta
import org.apache.nutch.storage.WebPage;
import org.apache.nutch.util.Bytes;
import org.apache.nutch.util.EncodingDetector;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
import org.apache.nutch.util.TableUtil;
import org.cyberneko.html.parsers.DOMFragmentParser;
@@ -173,13 +172,16 @@ public class HtmlParser implements Parse
if (LOG.isTraceEnabled()) { LOG.trace("Parsing..."); }
root = parse(input);
} catch (IOException e) {
+ LOG.error("Failed with the following IOException: ", e);
return ParseStatusUtils.getEmptyParse(e, getConf());
} catch (DOMException e) {
+ LOG.error("Failed with the following DOMException: ", e);
return ParseStatusUtils.getEmptyParse(e, getConf());
} catch (SAXException e) {
+ LOG.error("Failed with the following SAXException: ", e);
return ParseStatusUtils.getEmptyParse(e, getConf());
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following Exception: ", e);
return ParseStatusUtils.getEmptyParse(e, getConf());
}
@@ -283,7 +285,9 @@ public class HtmlParser implements Parse
}
res.appendChild(frag);
}
- } catch (Exception x) { x.printStackTrace(LogUtil.getWarnStream(LOG));};
+ } catch (Exception x) {
+ LOG.error("Failed with the following Exception: ", x);
+ };
return res;
}
Modified: nutch/branches/nutchgora/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java (original)
+++ nutch/branches/nutchgora/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java Wed Jan 11 17:20:57 2012
@@ -36,7 +36,6 @@ import org.apache.nutch.net.protocols.Ht
import org.apache.nutch.net.protocols.Response;
import org.apache.nutch.protocol.Content;
import org.apache.nutch.storage.WebPage;
-import org.apache.nutch.util.LogUtil;
/************************************
@@ -282,7 +281,6 @@ public class FtpResponse {
} catch (Exception e) {
if (ftp.LOG.isWarnEnabled()) {
ftp.LOG.warn(""+e);
- e.printStackTrace(LogUtil.getWarnStream(ftp.LOG));
}
// for any un-foreseen exception (run time exception or not),
// do ultimate clean and leave ftp.client for garbage collection
Modified: nutch/branches/nutchgora/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java (original)
+++ nutch/branches/nutchgora/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java Wed Jan 11 17:20:57 2012
@@ -37,7 +37,6 @@ import org.apache.nutch.protocol.Protoco
import org.apache.nutch.protocol.http.api.HttpBase;
import org.apache.nutch.protocol.http.api.HttpException;
import org.apache.nutch.storage.WebPage;
-import org.apache.nutch.util.LogUtil;
/** An HTTP response. */
public class HttpResponse implements Response {
@@ -307,7 +306,7 @@ public class HttpResponse implements Res
processHeaderLine(line);
} catch (Exception e) {
// fixme:
- e.printStackTrace(LogUtil.getErrorStream(Http.LOG));
+ Http.LOG.error("Failed with the following exception: ", e);
}
return;
}
Modified: nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java (original)
+++ nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java Wed Jan 11 17:20:57 2012
@@ -49,7 +49,6 @@ import org.apache.commons.httpclient.pro
// Nutch imports
import org.apache.nutch.storage.WebPage;
import org.apache.nutch.storage.WebPage.Field;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.net.protocols.Response;
import org.apache.nutch.protocol.ProtocolException;
import org.apache.nutch.protocol.http.api.HttpBase;
@@ -139,7 +138,6 @@ public class Http extends HttpBase {
if (LOG.isErrorEnabled()) {
LOG.error("Could not read " + authFile + " : "
+ ex.getMessage());
- ex.printStackTrace(LogUtil.getErrorStream(LOG));
}
}
}
Modified: nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java (original)
+++ nutch/branches/nutchgora/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java Wed Jan 11 17:20:57 2012
@@ -33,7 +33,6 @@ import org.apache.hadoop.conf.Configurab
// Nutch imports
import org.apache.nutch.metadata.Metadata;
-import org.apache.nutch.util.LogUtil;
/**
@@ -135,7 +134,7 @@ public class HttpAuthenticationFactory i
//TODO Add additional Authentication lookups here
}
} catch (Exception e) {
- e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("Failed with following exception: ", e);
}
return null;
}
Modified: nutch/branches/nutchgora/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java (original)
+++ nutch/branches/nutchgora/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java Wed Jan 11 17:20:57 2012
@@ -35,7 +35,6 @@ import org.apache.nutch.scoring.ScoringF
import org.apache.nutch.scoring.ScoringFilterException;
import org.apache.nutch.storage.WebPage;
import org.apache.nutch.util.Bytes;
-import org.apache.nutch.util.LogUtil;
/**
* This plugin implements a variant of an Online Page Importance Computation
@@ -145,7 +144,7 @@ public class OPICScoringFilter implement
scoreDatum.setScore(externalScore);
}
} catch (MalformedURLException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Failed with the following MalformedURLException: ", e);
scoreDatum.setScore(externalScore);
}
}
Modified: nutch/branches/nutchgora/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java (original)
+++ nutch/branches/nutchgora/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java Wed Jan 11 17:20:57 2012
@@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.nutch.util.DomUtil;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
import org.apache.nutch.util.ObjectCache;
import org.apache.xerces.dom.DocumentImpl;
@@ -80,8 +79,7 @@ public class CollectionManager extends C
parse(input);
} catch (Exception e) {
if (LOG.isWarnEnabled()) {
- LOG.warn("Error occured:" + e);
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.warn("Error occured: " + e);
}
}
}
Modified: nutch/branches/nutchgora/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java?rev=1230158&r1=1230157&r2=1230158&view=diff
==============================================================================
--- nutch/branches/nutchgora/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java (original)
+++ nutch/branches/nutchgora/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java Wed Jan 11 17:20:57 2012
@@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
// Nutch imports
import org.apache.nutch.net.URLNormalizer;
-import org.apache.nutch.util.LogUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.oro.text.regex.*;
@@ -81,8 +80,7 @@ public class BasicURLNormalizer implemen
adjacentSlashRule.substitution = new Perl5Substitution("/");
} catch (MalformedPatternException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
- throw new RuntimeException(e);
+ LOG.error("Failed with the following MalformedPatterException: " + e);
}
}