]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Fixes stderr appearing to have content when it doesn't
authorTrenton H <797416+stumpylog@users.noreply.github.com>
Fri, 11 Nov 2022 01:40:36 +0000 (17:40 -0800)
committerTrenton H <797416+stumpylog@users.noreply.github.com>
Fri, 11 Nov 2022 03:01:54 +0000 (19:01 -0800)
docs/advanced_usage.rst
src/documents/consumer.py

index eda2ca259645b46c1abf2111bc2ed9894516080b..0096da99c21d656dfa240bd3d0c03a5fb39c73b0 100644 (file)
@@ -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``.
index 7c0cbd2d344f81344ef1e8c76c37b05a800113fa..88d882350a10de3efa393a74b398d9b443cfec74 100644 (file)
@@ -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):