From cb29dcd6ccee90ebe7be74dcddc7b89c9014be3f Mon Sep 17 00:00:00 2001
From: bgamard <b.gamard@sismics.com>
Date: Tue, 19 May 2020 15:11:05 +0200
Subject: [PATCH] handle all content extraction errors

---
 .../core/listener/async/FileProcessingAsyncListener.java    | 6 +++---
 .../java/com/sismics/util/io/InputStreamReaderThread.java   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileProcessingAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileProcessingAsyncListener.java
index bf18a9d9..b1c3751f 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileProcessingAsyncListener.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/FileProcessingAsyncListener.java
@@ -166,17 +166,17 @@ public class FileProcessingAsyncListener {
                     ImageUtil.writeJpeg(thumbnail, outputStream);
                 }
             }
-        } catch (Exception e) {
+        } catch (Throwable e) {
             log.error("Unable to generate thumbnails for: " + file, e);
         }
 
         // Extract text content from the file
         long startTime = System.currentTimeMillis();
         String content = null;
-        log.error("Start extracting content from: " + file);
+        log.info("Start extracting content from: " + file);
         try {
             content = formatHandler.extractContent(event.getLanguage(), event.getUnencryptedFile());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             log.error("Error extracting content from: " + file, e);
         }
         log.info(MessageFormat.format("File content extracted in {0}ms: " + file.getId(), System.currentTimeMillis() - startTime));
diff --git a/docs-core/src/main/java/com/sismics/util/io/InputStreamReaderThread.java b/docs-core/src/main/java/com/sismics/util/io/InputStreamReaderThread.java
index 8556fc88..ff2da29d 100644
--- a/docs-core/src/main/java/com/sismics/util/io/InputStreamReaderThread.java
+++ b/docs-core/src/main/java/com/sismics/util/io/InputStreamReaderThread.java
@@ -34,7 +34,9 @@ public class InputStreamReaderThread extends Thread {
         try {
             BufferedReader reader = closer.register(new BufferedReader(new InputStreamReader(is)));
             for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-                logger.error(String.format(name + ": %s", line));
+                if (logger.isDebugEnabled()) {
+                    logger.debug(String.format(name + ": %s", line));
+                }
             }
         } catch (IOException x) {
             // NOP