Skip to content

Commit

Permalink
Fixes stderr appearing to have content when it doesn't
Browse files Browse the repository at this point in the history
  • Loading branch information
stumpylog committed Nov 11, 2022
1 parent 9a47963 commit c496558
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
7 changes: 7 additions & 0 deletions docs/advanced_usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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``.
Expand Down
16 changes: 12 additions & 4 deletions src/documents/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -537,11 +537,19 @@ def _log_script_outputs(self, completed_process: CompletedProcess):
)

# 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):
Expand Down

0 comments on commit c496558

Please sign in to comment.