From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Fri, 11 Nov 2022 01:40:36 +0000 (-0800)
Subject: Fixes stderr appearing to have content when it doesn't
X-Git-Tag: v1.10.0-beta.rc2~7^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4965580deebe97b40bfddaa9e0301d0ba108078;p=thirdparty%2Fpaperless-ngx.git

Fixes stderr appearing to have content when it doesn't
---

diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index eda2ca2596..0096da99c2 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -149,6 +149,9 @@ which will in turn call `pdf2pdfocr.py`_ on your document, which will then
 overwrite the file with an OCR'd version of the file and exit.  At which point,
 the consumption process will begin with the newly modified file.
 
+The script's stdout and stderr will be logged line by line to the webserver log, along
+with the exit code of the script.
+
 .. _pdf2pdfocr.py: https://github.com/LeoFCardoso/pdf2pdfocr
 
 .. _advanced-post_consume_script:
@@ -178,6 +181,10 @@ example, you can take a look at `post-consumption-example.sh`_ in this project.
 
 The post consumption script cannot cancel the consumption process.
 
+The script's stdout and stderr will be logged line by line to the webserver log, along
+with the exit code of the script.
+
+
 Docker
 ------
 Assumed you have ``/home/foo/paperless-ngx/scripts/post-consumption-example.sh``.
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 7c0cbd2d34..88d882350a 100644
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -537,11 +537,19 @@ class Consumer(LoggingMixin):
         )
 
         # Decode the output (if any)
-        stdout_str = completed_process.stdout.decode("utf8", errors="ignore").split(
-            "\n",
+        stdout_str = (
+            completed_process.stdout.decode("utf8", errors="ignore")
+            .strip()
+            .split(
+                "\n",
+            )
         )
-        stderr_str = completed_process.stderr.decode("utf8", errors="ignore").split(
-            "\n",
+        stderr_str = (
+            completed_process.stderr.decode("utf8", errors="ignore")
+            .strip()
+            .split(
+                "\n",
+            )
         )
 
         if len(stdout_str):