Author: lewismc
Date: Tue Dec 27 14:44:58 2011
New Revision: 1224917
URL: http://svn.apache.org/viewvc?rev=1224917&view=rev
Log:
commit to address NUTCH-1138 and update to CHANGES.txt
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java
nutch/trunk/src/java/org/apache/nutch/fetcher/OldFetcher.java
nutch/trunk/src/java/org/apache/nutch/parse/ParseSegment.java
nutch/trunk/src/java/org/apache/nutch/parse/ParserFactory.java
nutch/trunk/src/java/org/apache/nutch/segment/SegmentReader.java
nutch/trunk/src/java/org/apache/nutch/tools/DmozParser.java
nutch/trunk/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
nutch/trunk/src/java/org/apache/nutch/util/DeflateUtils.java
nutch/trunk/src/java/org/apache/nutch/util/DomUtil.java
nutch/trunk/src/java/org/apache/nutch/util/EncodingDetector.java
nutch/trunk/src/java/org/apache/nutch/util/GZIPUtils.java
nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java
nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Tue Dec 27 14:44:58 2011
@@ -1,5 +1,7 @@
Nutch Change Log
+* NUTCH-1138 remove LogUtil from trunk and nutch gora (lewismc)
+
* NUTCH-1231 Upgrade to Tika 1.0 (markus)
* NUTCH-1230 MimeType API deprecated and breaks with Tika 1.0 (markus)
Modified: nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher.java Tue Dec 27
14:44:58 2011
@@ -27,7 +27,7 @@ import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -834,7 +834,6 @@ public class Fetcher extends Configured
} catch (Throwable e) {
if (LOG.isErrorEnabled()) {
- e.printStackTrace(LogUtil.getErrorStream(LOG));
LOG.error("fetcher caught:"+e.toString());
}
} finally {
@@ -937,7 +936,6 @@ public class Fetcher extends Configured
scfilters.passScoreBeforeParsing(key, datum, content);
} catch (Exception e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Couldn't pass score, url " + key + " (" + e + ")");
}
}
@@ -998,7 +996,6 @@ public class Fetcher extends Configured
scfilters.passScoreAfterParsing(url, content, parse);
} catch (Exception e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Couldn't pass score, url " + key + " (" + e + ")");
}
}
@@ -1070,7 +1067,6 @@ public class Fetcher extends Configured
}
} catch (IOException e) {
if (LOG.isErrorEnabled()) {
- e.printStackTrace(LogUtil.getErrorStream(LOG));
LOG.error("fetcher caught:"+e.toString());
}
}
Modified: nutch/trunk/src/java/org/apache/nutch/fetcher/OldFetcher.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/fetcher/OldFetcher.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/fetcher/OldFetcher.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/fetcher/OldFetcher.java Tue Dec 27
14:44:58 2011
@@ -22,7 +22,7 @@ import java.net.MalformedURLException;
import java.text.SimpleDateFormat;
import java.util.Map.Entry;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -131,7 +131,6 @@ public class OldFetcher extends Configur
}
} catch (IOException e) {
if (LOG.isErrorEnabled()) {
- e.printStackTrace(LogUtil.getErrorStream(LOG));
LOG.error("fetcher caught:"+e.toString());
}
break;
@@ -254,7 +253,6 @@ public class OldFetcher extends Configur
} catch (Throwable e) {
if (LOG.isErrorEnabled()) {
- e.printStackTrace(LogUtil.getErrorStream(LOG));
LOG.error("fetcher caught:"+e.toString());
}
} finally {
@@ -327,7 +325,6 @@ public class OldFetcher extends Configur
scfilters.passScoreBeforeParsing(key, datum, content);
} catch (Exception e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Couldn't pass score, url " + key + " (" + e + ")");
}
}
@@ -387,7 +384,6 @@ public class OldFetcher extends Configur
scfilters.passScoreAfterParsing(url, content, parse);
} catch (Exception e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Couldn't pass score, url " + key + " (" + e + ")");
}
}
@@ -398,7 +394,6 @@ public class OldFetcher extends Configur
}
} catch (IOException e) {
if (LOG.isErrorEnabled()) {
- e.printStackTrace(LogUtil.getErrorStream(LOG));
LOG.error("fetcher caught:"+e.toString());
}
}
Modified: nutch/trunk/src/java/org/apache/nutch/parse/ParseSegment.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/parse/ParseSegment.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/parse/ParseSegment.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/parse/ParseSegment.java Tue Dec 27
14:44:58 2011
@@ -117,7 +117,6 @@ public class ParseSegment extends Config
scfilters.passScoreAfterParsing(url, content, parse);
} catch (ScoringFilterException e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Error passing score: "+ url +": "+e.getMessage());
}
}
Modified: nutch/trunk/src/java/org/apache/nutch/parse/ParserFactory.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/parse/ParserFactory.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/parse/ParserFactory.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/parse/ParserFactory.java Tue Dec 27
14:44:58 2011
@@ -35,7 +35,6 @@ import org.apache.nutch.plugin.Extension
import org.apache.nutch.plugin.ExtensionPoint;
import org.apache.nutch.plugin.PluginRuntimeException;
import org.apache.nutch.plugin.PluginRepository;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.MimeUtil;
import org.apache.nutch.util.ObjectCache;
@@ -136,7 +135,6 @@ 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()
Modified: nutch/trunk/src/java/org/apache/nutch/segment/SegmentReader.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/segment/SegmentReader.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/segment/SegmentReader.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/segment/SegmentReader.java Tue Dec 27
14:44:58 2011
@@ -66,7 +66,6 @@ import org.apache.nutch.parse.ParseData;
import org.apache.nutch.parse.ParseText;
import org.apache.nutch.protocol.Content;
import org.apache.nutch.util.HadoopFSUtil;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
import org.apache.nutch.util.NutchJob;
@@ -138,7 +137,7 @@ public class SegmentReader extends Confi
try {
this.fs = FileSystem.get(getConf());
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("IOException:", e);
}
}
@@ -153,7 +152,7 @@ public class SegmentReader extends Confi
try {
this.fs = FileSystem.get(getConf());
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("IOException:", e);
}
}
@@ -295,7 +294,7 @@ public class SegmentReader extends Confi
List<Writable> res = getMapRecords(new Path(segment,
Content.DIR_NAME), key);
results.put("co", res);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Exception:", e);
}
}
});
@@ -305,7 +304,7 @@ public class SegmentReader extends Confi
List<Writable> res = getMapRecords(new Path(segment,
CrawlDatum.FETCH_DIR_NAME), key);
results.put("fe", res);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Exception:", e);
}
}
});
@@ -315,7 +314,7 @@ public class SegmentReader extends Confi
List<Writable> res = getSeqRecords(new Path(segment,
CrawlDatum.GENERATE_DIR_NAME), key);
results.put("ge", res);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Exception:", e);
}
}
});
@@ -325,7 +324,7 @@ public class SegmentReader extends Confi
List<Writable> res = getSeqRecords(new Path(segment,
CrawlDatum.PARSE_DIR_NAME), key);
results.put("pa", res);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Exception:", e);
}
}
});
@@ -335,7 +334,7 @@ public class SegmentReader extends Confi
List<Writable> res = getMapRecords(new Path(segment,
ParseData.DIR_NAME), key);
results.put("pd", res);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Exception:", e);
}
}
});
@@ -345,7 +344,7 @@ public class SegmentReader extends Confi
List<Writable> res = getMapRecords(new Path(segment,
ParseText.DIR_NAME), key);
results.put("pt", res);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Exception:", e);
}
}
});
Modified: nutch/trunk/src/java/org/apache/nutch/tools/DmozParser.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/tools/DmozParser.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/tools/DmozParser.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/tools/DmozParser.java Tue Dec 27
14:44:58 2011
@@ -26,14 +26,13 @@ import org.xml.sax.*;
import org.xml.sax.helpers.*;
import org.apache.xerces.util.XMLChar;
-// Commons Logging imports
+// Slf4j 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 +238,6 @@ public class DmozParser {
public void error(SAXParseException spe) {
if (LOG.isErrorEnabled()) {
LOG.error("Error: " + spe.toString() + ": " + spe.getMessage());
- spe.printStackTrace(LogUtil.getErrorStream(LOG));
}
}
@@ -251,7 +249,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.getErrorStream(LOG));
}
}
@@ -261,7 +258,6 @@ public class DmozParser {
public void warning(SAXParseException spe) {
if (LOG.isWarnEnabled()) {
LOG.warn("Warning: " + spe.toString() + ": " + spe.getMessage());
- spe.printStackTrace(LogUtil.getWarnStream(LOG));
}
}
}
@@ -301,7 +297,6 @@ public class DmozParser {
} catch (Exception e) {
if (LOG.isErrorEnabled()) {
LOG.error(e.toString());
- e.printStackTrace(LogUtil.getErrorStream(LOG));
}
System.exit(0);
} finally {
@@ -323,7 +318,6 @@ public class DmozParser {
catch (Exception e) {
if (LOG.isErrorEnabled()) {
LOG.error(e.toString());
- e.printStackTrace(LogUtil.getErrorStream(LOG));
}
System.exit(0);
} finally {
Modified: nutch/trunk/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
(original)
+++ nutch/trunk/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java Tue
Dec 27 14:44:58 2011
@@ -55,7 +55,6 @@ import org.apache.nutch.parse.ParseUtil;
import org.apache.nutch.protocol.Content;
import org.apache.nutch.protocol.ProtocolStatus;
import org.apache.nutch.scoring.ScoringFilters;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
import org.apache.nutch.util.NutchJob;
import org.apache.nutch.util.StringUtil;
@@ -168,7 +167,6 @@ public class ArcSegmentCreator
}
catch (Exception e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Couldn't pass score, url " + key + " (" + e + ")");
}
}
@@ -223,7 +221,6 @@ public class ArcSegmentCreator
}
catch (Exception e) {
if (LOG.isWarnEnabled()) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
LOG.warn("Couldn't pass score, url " + key + " (" + e + ")");
}
}
Modified: nutch/trunk/src/java/org/apache/nutch/util/DeflateUtils.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/util/DeflateUtils.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/util/DeflateUtils.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/util/DeflateUtils.java Tue Dec 27
14:44:58 2011
@@ -23,7 +23,7 @@ import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
import java.util.zip.DeflaterOutputStream;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -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("Error compressing: ", e);
}
try {
outStream.close();
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error closing: ", e);
}
return byteOut.toByteArray();
Modified: nutch/trunk/src/java/org/apache/nutch/util/DomUtil.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/util/DomUtil.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/util/DomUtil.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/util/DomUtil.java Tue Dec 27 14:44:58
2011
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,11 +66,11 @@ public class DomUtil {
}
element = (Element)parser.getDocument().getChildNodes().item(i);
} catch (FileNotFoundException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
} catch (SAXException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", 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("Error: ", e1);
} catch (IOException e1) {
- e1.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e1);
} catch (TransformerConfigurationException e2) {
- e2.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e2);
} catch (TransformerException ex) {
- ex.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", ex);
}
}
}
Modified: nutch/trunk/src/java/org/apache/nutch/util/EncodingDetector.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/util/EncodingDetector.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/util/EncodingDetector.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/util/EncodingDetector.java Tue Dec 27
14:44:58 2011
@@ -32,7 +32,6 @@ import org.apache.hadoop.conf.Configurat
import org.apache.nutch.metadata.Metadata;
import org.apache.nutch.net.protocols.Response;
import org.apache.nutch.protocol.Content;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
import com.ibm.icu.text.CharsetDetector;
@@ -178,8 +177,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/trunk/src/java/org/apache/nutch/util/GZIPUtils.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/util/GZIPUtils.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/util/GZIPUtils.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/util/GZIPUtils.java Tue Dec 27
14:44:58 2011
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,19 +130,19 @@ public class GZIPUtils {
try {
outStream.write(in);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error writing outStream: ", e);
}
try {
outStream.close();
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error closing outStream: ", e);
}
return byteOut.toByteArray();
} catch (IOException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
return null;
}
}
Modified: nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/util/LogUtil.java Tue Dec 27 14:44:58
2011
@@ -1,115 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nutch.util;
-
-// JDK imports
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.lang.reflect.Method;
-
-// slf4j Logging imports
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Utility class for logging.
- *
- * @author Jérôme Charron
- */
-public class LogUtil {
-
- private final static Logger LOG = LoggerFactory.getLogger(LogUtil.class);
-
- private static Method TRACE = null;
- private static Method DEBUG = null;
- private static Method INFO = null;
- private static Method WARN = null;
- private static Method ERROR = null;
- private static Method FATAL = null;
-
- static {
- try {
- TRACE = Logger.class.getMethod("trace", new Class[] { String.class });
- DEBUG = Logger.class.getMethod("debug", new Class[] { String.class });
- INFO = Logger.class.getMethod("info", new Class[] { String.class });
- WARN = Logger.class.getMethod("warn", new Class[] { String.class });
- ERROR = Logger.class.getMethod("error", new Class[] { String.class });
- FATAL = Logger.class.getMethod("error", new Class[] { String.class });
- } catch(Exception e) {
- if (LOG.isErrorEnabled()) {
- LOG.error("Cannot init log methods", e);
- }
- }
- }
-
-
- public static PrintStream getTraceStream(final Logger logger) {
- return getLogStream(logger, TRACE);
- }
-
- public static PrintStream getDebugStream(final Logger logger) {
- return getLogStream(logger, DEBUG);
- }
-
- public static PrintStream getInfoStream(final Logger logger) {
- return getLogStream(logger, INFO);
- }
-
- public static PrintStream getWarnStream(final Logger logger) {
- return getLogStream(logger, WARN);
- }
-
- public static PrintStream getErrorStream(final Logger logger) {
- return getLogStream(logger, ERROR);
- }
-
- public static PrintStream getFatalStream(final Logger logger) {
- return getLogStream(logger, FATAL);
- }
-
- /** Returns a stream that, when written to, adds log lines. */
- private static PrintStream getLogStream(final Logger logger, final Method
method) {
- return new PrintStream(new ByteArrayOutputStream() {
- private int scan = 0;
-
- private boolean hasNewline() {
- for (; scan < count; scan++) {
- if (buf[scan] == '\n')
- return true;
- }
- return false;
- }
-
- public void flush() throws IOException {
- if (!hasNewline())
- return;
- try {
- method.invoke(logger, new String[] { toString().trim() });
- } catch (Exception e) {
- if (LOG.isErrorEnabled()) {
- LOG.error("Cannot log with method [" + method + "]", e);
- }
- }
- reset();
- scan = 0;
- }
- }, true);
- }
-
-}
Modified:
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
(original)
+++
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
Tue Dec 27 14:44:58 2011
@@ -35,7 +35,7 @@ import org.apache.nutch.protocol.Protoco
import org.apache.nutch.protocol.RobotRules;
import org.apache.nutch.util.GZIPUtils;
import org.apache.nutch.util.DeflateUtils;
-import org.apache.nutch.util.LogUtil;
+
// Hadoop imports
import org.apache.hadoop.conf.Configuration;
@@ -194,7 +194,7 @@ public abstract class HttpBase implement
+ u));
}
} catch (Throwable e) {
- e.printStackTrace(LogUtil.getErrorStream(logger));
+ logger.error("Failed to get protocol output", e);
return new ProtocolOutput(null, new ProtocolStatus(e));
}
}
Modified:
nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
(original)
+++
nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
Tue Dec 27 14:44:58 2011
@@ -152,7 +152,7 @@ public class HtmlParser implements Parse
} catch (SAXException e) {
return new ParseStatus(e).getEmptyParseResult(content.getUrl(),
getConf());
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
return new ParseStatus(e).getEmptyParseResult(content.getUrl(),
getConf());
}
@@ -259,7 +259,9 @@ public class HtmlParser implements Parse
}
res.appendChild(frag);
}
- } catch (Exception x) { x.printStackTrace(LogUtil.getWarnStream(LOG));};
+ } catch (Exception e) {
+ LOG.error("Error: ", e);
+ };
return res;
}
Modified:
nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
(original)
+++
nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
Tue Dec 27 14:44:58 2011
@@ -28,7 +28,6 @@ import org.apache.nutch.metadata.Metadat
import org.apache.nutch.net.protocols.Response;
import org.apache.nutch.parse.*;
import org.apache.nutch.protocol.Content;
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.util.NutchConfiguration;
import org.apache.hadoop.conf.Configuration;
@@ -102,7 +101,7 @@ public class SWFParser implements Parser
outlinks.add(olinks[i]);
}
} catch (Exception e) { // run time exception
- e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("Error, runtime exception: ", e);
return new ParseStatus(ParseStatus.FAILED, "Can't be handled as SWF
document. " + e).getEmptyParseResult(content.getUrl(), getConf());
}
if (text == null) text = "";
Modified:
nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java
(original)
+++
nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/FtpResponse.java
Tue Dec 27 14:44:58 2011
@@ -30,7 +30,6 @@ import org.apache.nutch.protocol.Content
import org.apache.nutch.metadata.Metadata;
import org.apache.nutch.net.protocols.HttpDateFormat;
import org.apache.nutch.net.protocols.Response;
-import org.apache.nutch.util.LogUtil;
import org.apache.hadoop.conf.Configuration;
@@ -286,8 +285,7 @@ public class FtpResponse {
} catch (Exception e) {
if (ftp.LOG.isWarnEnabled()) {
- ftp.LOG.warn(""+e);
- e.printStackTrace(LogUtil.getWarnStream(ftp.LOG));
+ ftp.LOG.warn("Error: ", e);
}
// for any un-foreseen exception (run time exception or not),
// do ultimate clean and leave ftp.client for garbage collection
Modified:
nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
(original)
+++
nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
Tue Dec 27 14:44:58 2011
@@ -37,7 +37,6 @@ import org.apache.nutch.net.protocols.Re
import org.apache.nutch.protocol.ProtocolException;
import org.apache.nutch.protocol.http.api.HttpBase;
import org.apache.nutch.protocol.http.api.HttpException;
-import org.apache.nutch.util.LogUtil;
/** An HTTP response. */
@@ -387,7 +386,7 @@ public class HttpResponse implements Res
processHeaderLine(line);
} catch (Exception e) {
// fixme:
- e.printStackTrace(LogUtil.getErrorStream(Http.LOG));
+ Http.LOG.warn("Error: ", e);
}
return;
}
Modified:
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
(original)
+++
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
Tue Dec 27 14:44:58 2011
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,6 @@ import org.apache.commons.httpclient.par
import org.apache.commons.httpclient.protocol.Protocol;
// Nutch imports
-import org.apache.nutch.util.LogUtil;
import org.apache.nutch.crawl.CrawlDatum;
import org.apache.nutch.net.protocols.Response;
import org.apache.nutch.protocol.ProtocolException;
@@ -123,7 +122,6 @@ public class Http extends HttpBase {
} catch (Exception ex) {
if (LOG.isErrorEnabled()) {
LOG.error("Could not read " + authFile + " : " + ex.getMessage());
- ex.printStackTrace(LogUtil.getErrorStream(LOG));
}
}
}
Modified:
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
(original)
+++
nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
Tue Dec 27 14:44:58 2011
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -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("Error: ", e);
}
return null;
}
Modified:
nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
(original)
+++
nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
Tue Dec 27 14:44:58 2011
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map.Entry;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +38,6 @@ import org.apache.nutch.parse.ParseData;
import org.apache.nutch.protocol.Content;
import org.apache.nutch.scoring.ScoringFilter;
import org.apache.nutch.scoring.ScoringFilterException;
-import org.apache.nutch.util.LogUtil;
/**
* This plugin implements a variant of an Online Page Importance Computation
@@ -116,7 +115,7 @@ public class OPICScoringFilter implement
try {
score = Float.parseFloat(scoreString);
} catch (Exception e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
}
}
int validCount = targets.size();
@@ -142,7 +141,7 @@ public class OPICScoringFilter implement
target.getValue().setScore(externalScore);
}
} catch (MalformedURLException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
target.getValue().setScore(externalScore);
}
}
Modified:
nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
(original)
+++
nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
Tue Dec 27 14:44:58 2011
@@ -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;
@@ -79,7 +78,6 @@ public class CollectionManager extends C
} catch (Exception e) {
if (LOG.isWarnEnabled()) {
LOG.warn("Error occured:" + e);
- e.printStackTrace(LogUtil.getWarnStream(LOG));
}
}
}
Modified:
nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java?rev=1224917&r1=1224916&r2=1224917&view=diff
==============================================================================
---
nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
(original)
+++
nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
Tue Dec 27 14:44:58 2011
@@ -20,13 +20,12 @@ package org.apache.nutch.net.urlnormaliz
import java.net.URL;
import java.net.MalformedURLException;
-// Commons Logging imports
+// Slf4j Logging imports
import org.slf4j.Logger;
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,7 +80,7 @@ public class BasicURLNormalizer implemen
adjacentSlashRule.substitution = new Perl5Substitution("/");
} catch (MalformedPatternException e) {
- e.printStackTrace(LogUtil.getWarnStream(LOG));
+ LOG.error("Error: ", e);
throw new RuntimeException(e);
}
}
