You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/10/07 17:32:44 UTC
[1/2] tika git commit: TIKA-2110-- log full exception throughout
tika-batch
Repository: tika
Updated Branches:
refs/heads/2.x 1ec8c0947 -> 3fe8ef819
TIKA-2110-- log full exception throughout tika-batch
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/af74ea5c
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/af74ea5c
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/af74ea5c
Branch: refs/heads/2.x
Commit: af74ea5c95eb056549d7c30fcab574fec875844d
Parents: 1ab6c81
Author: tballison <ta...@mitre.org>
Authored: Fri Oct 7 13:29:11 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Oct 7 13:29:11 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/tika/batch/BatchNoRestartError.java | 3 +++
.../src/main/java/org/apache/tika/batch/BatchProcess.java | 10 +++++-----
.../java/org/apache/tika/batch/FileResourceConsumer.java | 4 ++--
.../java/org/apache/tika/batch/FileResourceCrawler.java | 4 ++--
.../java/org/apache/tika/batch/fs/AbstractFSConsumer.java | 2 +-
.../org/apache/tika/batch/fs/BasicTikaFSConsumer.java | 6 +++---
.../java/org/apache/tika/batch/fs/FSDirectoryCrawler.java | 3 +--
.../apache/tika/batch/fs/builders/FSCrawlerBuilder.java | 2 +-
.../tika/batch/fs/strawman/StrawManTikaAppDriver.java | 2 +-
9 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/BatchNoRestartError.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/BatchNoRestartError.java b/tika-batch/src/main/java/org/apache/tika/batch/BatchNoRestartError.java
index 3c8c154..e5dadcc 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/BatchNoRestartError.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/BatchNoRestartError.java
@@ -30,4 +30,7 @@ public class BatchNoRestartError extends Error {
public BatchNoRestartError(String message) {
super(message);
}
+ public BatchNoRestartError(String message, Throwable t) {
+ super(message, t);
+ }
}
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java b/tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java
index d5c556b..3b8a28b 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/BatchProcess.java
@@ -17,6 +17,8 @@ package org.apache.tika.batch;
* limitations under the License.
*/
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.IOException;
import java.io.PrintStream;
import java.util.Date;
@@ -34,8 +36,6 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
/**
* This is the main processor class for a single process.
* This class can only be run once.
@@ -232,7 +232,7 @@ public class BatchProcess implements Callable<ParallelFileProcessingResult> {
} else {
causeForTermination = CAUSE_FOR_TERMINATION.MAIN_LOOP_EXCEPTION;
}
- logger.error("Main loop execution exception: " + e.getMessage());
+ logger.error("Main loop execution exception", e);
break;
}
}
@@ -307,9 +307,9 @@ public class BatchProcess implements Callable<ParallelFileProcessingResult> {
added += crawlerResult.getAdded();
} //else ...we don't care about anything else stopping at this point
} catch (ExecutionException e) {
- logger.error("Execution exception trying to shutdown after shutdownNow:" + e.getMessage());
+ logger.error("Execution exception trying to shutdown after shutdownNow", e);
} catch (InterruptedException e) {
- logger.error("Interrupted exception trying to shutdown after shutdownNow:" + e.getMessage());
+ logger.error("Interrupted exception trying to shutdown after shutdownNow", e);
}
}
//do we need to restart?
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java b/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
index 7f85026..72e4e9c 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/FileResourceConsumer.java
@@ -353,7 +353,7 @@ public abstract class FileResourceConsumer implements Callable<IFileProcessorFut
try {
closeable.close();
} catch (IOException e){
- logger.warn(e.getMessage());
+ logger.warn(e.getMessage(), e);
}
}
closeable = null;
@@ -367,7 +367,7 @@ public abstract class FileResourceConsumer implements Callable<IFileProcessorFut
try {
((Flushable)closeable).flush();
} catch (IOException e) {
- logger.warn(e.getMessage());
+ logger.warn(e.getMessage(), e);
}
}
close(closeable);
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/FileResourceCrawler.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/FileResourceCrawler.java b/tika-batch/src/main/java/org/apache/tika/batch/FileResourceCrawler.java
index 4dc4f2f..e3ae5c0 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/FileResourceCrawler.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/FileResourceCrawler.java
@@ -80,9 +80,9 @@ public abstract class FileResourceCrawler implements Callable<IFileProcessorFutu
start();
} catch (InterruptedException e) {
//this can be triggered by shutdownNow in BatchProcess
- logger.info("InterruptedException in FileCrawler: " + e.getMessage());
+ logger.info("InterruptedException in FileCrawler: " + e.getMessage(), e);
} catch (Exception e) {
- logger.error("Exception in FileResourceCrawler: " + e.getMessage());
+ logger.error("Exception in FileResourceCrawler: " + e.getMessage(), e);
} finally {
isActive = false;
}
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/fs/AbstractFSConsumer.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/AbstractFSConsumer.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/AbstractFSConsumer.java
index 723b5e0..22757e0 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/AbstractFSConsumer.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/AbstractFSConsumer.java
@@ -53,7 +53,7 @@ public abstract class AbstractFSConsumer extends FileResourceConsumer {
logger.error("{}", getXMLifiedLogMsg(IO_OS,
fileResource.getResourceId(), e));
throw new BatchNoRestartError("IOException trying to open output stream for " +
- fileResource.getResourceId() + " :: " + e.getMessage());
+ fileResource.getResourceId() + " :: " + e.getMessage(), e);
}
return os;
}
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java
index 227a426..636f4d2 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/BasicTikaFSConsumer.java
@@ -17,6 +17,8 @@ package org.apache.tika.batch.fs;
* limitations under the License.
*/
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
@@ -32,8 +34,6 @@ import org.apache.tika.parser.Parser;
import org.apache.tika.sax.ContentHandlerFactory;
import org.xml.sax.ContentHandler;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
/**
* Basic FileResourceConsumer that reads files from an input
* directory and writes content to the output directory.
@@ -94,7 +94,7 @@ public class BasicTikaFSConsumer extends AbstractFSConsumer {
logger.error(getXMLifiedLogMsg("output_encoding_ex",
fileResource.getResourceId(), e));
flushAndClose(os);
- throw new RuntimeException(e.getMessage());
+ throw new RuntimeException(e);
}
//now actually call parse!
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
index c844de9..a718abc 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
@@ -23,7 +23,6 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
@@ -90,7 +89,7 @@ public class FSDirectoryCrawler extends FileResourceCrawler {
}
} catch (IOException e) {
logger.warn("FSFileAdder couldn't read "+directory.toAbsolutePath() +
- ": "+e.getMessage());
+ ": "+e.getMessage(), e);
}
if (files.size() == 0) {
logger.info("Empty directory: " + directory.toAbsolutePath());
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/FSCrawlerBuilder.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/FSCrawlerBuilder.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/FSCrawlerBuilder.java
index 53a3f96..9049c38 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/FSCrawlerBuilder.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/FSCrawlerBuilder.java
@@ -90,7 +90,7 @@ public class FSCrawlerBuilder implements ICrawlerBuilder {
} catch (UnsupportedEncodingException e) {
throw new RuntimeException("fileList encoding not supported: "+encodingString);
} catch (IOException e) {
- throw new RuntimeException("IOException while trying to open fileList: " + e.getMessage());
+ throw new RuntimeException("IOException while trying to open fileList: " + e.getMessage(), e);
}
} else {
FSDirectoryCrawler.CRAWL_ORDER crawlOrder = getCrawlOrder(attributes.get(CRAWL_ORDER));
http://git-wip-us.apache.org/repos/asf/tika/blob/af74ea5c/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
----------------------------------------------------------------------
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
index 3f0fdfe..6e447b5 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
@@ -117,7 +117,7 @@ public class StrawManTikaAppDriver implements Callable<Integer> {
gobblerThread = new Thread(gobbler);
gobblerThread.start();
} catch (IOException e) {
- logger.error(e.getMessage());
+ logger.error(e.getMessage(), e);
return FileVisitResult.CONTINUE;
}
[2/2] tika git commit: Merge remote-tracking branch 'origin/2.x' into
2.x
Posted by ta...@apache.org.
Merge remote-tracking branch 'origin/2.x' into 2.x
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/3fe8ef81
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/3fe8ef81
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/3fe8ef81
Branch: refs/heads/2.x
Commit: 3fe8ef8194e9b66944ffaecab2086e72b67d1bca
Parents: af74ea5 1ec8c09
Author: tballison <ta...@mitre.org>
Authored: Fri Oct 7 13:32:39 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Oct 7 13:32:39 2016 -0400
----------------------------------------------------------------------
.../test/java/org/apache/tika/parser/pdf/PDFParserTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------