[tika] branch branch_1x updated: TIKA-2754 -- include filename in logging in tika-server

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new c6cacec  TIKA-2754 -- include filename in logging in tika-server
c6cacec is described below

commit c6cacece933b2a1a73bc69139f7b019bc3a25950
Author: TALLISON <talli...@apache.org>
AuthorDate: Fri Oct 12 12:18:55 2018 -0400

    TIKA-2754 -- include filename in logging in tika-server
---
 .../org/apache/tika/server/resource/DetectorResource.java     |  4 +++-
 .../java/org/apache/tika/server/resource/TikaResource.java    | 11 +++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java
 
b/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java
index acbdfaa..ec8103e 100644
--- 
a/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java
+++ 
b/tika-server/src/main/java/org/apache/tika/server/resource/DetectorResource.java
@@ -60,9 +60,11 @@ public class DetectorResource {
         try {
             return TikaResource.getConfig().getDetector().detect(tis, 
met).toString();
         } catch (IOException e) {
-            LOG.warn("Unable to detect MIME type for file. Reason: {}", 
e.getMessage(), e);
+            LOG.warn("Unable to detect MIME type for file. Reason: {} ({})",
+                    e.getMessage(), filename, e);
             return MediaType.OCTET_STREAM.toString();
         } catch (OutOfMemoryError e) {
+            LOG.error("OOM while detecting: ({})", filename, e);
             serverStatus.setStatus(ServerStatus.STATUS.ERROR);
             throw e;
         } finally {
diff --git 
a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java 
b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
index 1502411..d832aa9 100644
--- 
a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
+++ 
b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
@@ -81,7 +81,6 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 @Path("/tika")
@@ -395,21 +394,21 @@ public class TikaResource {
                              ContentHandler handler, Metadata metadata, 
ParseContext parseContext) throws IOException {
 
         checkIsOperating();
-
+        String fileName = metadata.get(Metadata.RESOURCE_NAME_KEY);
         long taskId = SERVER_STATUS.start(ServerStatus.TASK.PARSE,
-                metadata.get(Metadata.RESOURCE_NAME_KEY));
+                fileName);
         try {
             parser.parse(inputStream, handler, metadata, parseContext);
         } catch (SAXException e) {
             throw new TikaServerParseException(e);
         } catch (EncryptedDocumentException e) {
-            logger.warn("{}: Encrypted document", path, e);
+            logger.warn("{}: Encrypted document ({})", path, fileName, e);
             throw new TikaServerParseException(e);
         } catch (Exception e) {
-            logger.warn("{}: Text extraction failed", path, e);
+            logger.warn("{}: Text extraction failed ({})", path, fileName, e);
             throw new TikaServerParseException(e);
         } catch (OutOfMemoryError e) {
-            logger.error("{}: OOM", path, e);
+            logger.warn("{}: OOM ({})", path, fileName, e);
             SERVER_STATUS.setStatus(ServerStatus.STATUS.ERROR);
             throw e;
         } finally {