[tika] branch TIKA-2725 updated: TIKA-2725 -- further cleanups

[tallison]

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

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


The following commit(s) were added to refs/heads/TIKA-2725 by this push:
     new 8d9dba5  TIKA-2725 -- further cleanups
8d9dba5 is described below

commit 8d9dba56dbe5fdc677b80d2453acab8e0a3b53b9
Author: TALLISON <talli...@apache.org>
AuthorDate: Fri Sep 14 11:52:29 2018 -0400

    TIKA-2725 -- further cleanups
---
 .../main/java/org/apache/tika/server/resource/DetectorResource.java   | 1 +
 .../src/main/java/org/apache/tika/server/resource/TikaResource.java   | 4 ++--
 .../main/java/org/apache/tika/server/resource/TranslateResource.java  | 3 ++-
 3 files changed, 5 insertions(+), 3 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 2ffcb12..eb0d330 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
@@ -65,6 +65,7 @@ public class DetectorResource {
             LOG.warn("Unable to detect MIME type for file. Reason: {}", 
e.getMessage(), e);
             return MediaType.OCTET_STREAM.toString();
         } catch (OutOfMemoryError e) {
+            LOG.error("{}: OOM", 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 1f5d8c1..582fafe 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
@@ -388,8 +388,7 @@ public class TikaResource {
 
         checkIsOperating();
 
-        long taskId = SERVER_STATUS.start(ServerStatus.TASK.PARSE,
-                metadata.get(TikaCoreProperties.RESOURCE_NAME_KEY));
+        long taskId = SERVER_STATUS.start(ServerStatus.TASK.PARSE, path);
         try {
             parser.parse(inputStream, handler, metadata, parseContext);
         } catch (SAXException e) {
@@ -401,6 +400,7 @@ public class TikaResource {
             logger.warn("{}: Text extraction failed", path, e);
             throw new TikaServerParseException(e);
         } catch (OutOfMemoryError e) {
+            logger.error("{}: OOM", path, e);
             SERVER_STATUS.setStatus(ServerStatus.STATUS.ERROR);
             throw e;
         } finally {
diff --git 
a/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
 
b/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
index 0417077..0d5dc6c 100644
--- 
a/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
+++ 
b/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
@@ -104,7 +104,8 @@ public class TranslateResource {
                try {
                        return translate.translate(content, sLang, dLang);
                } catch (OutOfMemoryError e) {
-                   serverStatus.setStatus(ServerStatus.STATUS.ERROR);
+            LOG.error("OOM", e);
+            serverStatus.setStatus(ServerStatus.STATUS.ERROR);
                    throw e;
         } finally {
                        serverStatus.complete(taskId);