almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Capture missing logs in second-stage conversion

Browse source 
For a while now, we didn't get logs for the second-stage conversion
when using containers. Extend the code to log any captured output from
the second stage conversion, only if we run Dangerzone via our dev
entrypoint.

Note that the Qubes isolation provider was always logging output from
the second stage of the conversion.
This commit is contained in:
Alex Pyrgiotis 2024-03-05 12:14:30 +02:00
parent 0449840ec3
commit a31f3370d0
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dangerzone/isolation_provider/container.py
View file

@ -12,7 +12,7 @@ from typing import Any, List, Optional
from ..conversion import errors from ..conversion import errors
from ..document import Document from ..document import Document
from ..util import get_resource_path, get_subprocess_startupinfo, get_tmp_dir from ..util import get_resource_path, get_subprocess_startupinfo, get_tmp_dir
from .base import IsolationProvider from .base import PIXELS_TO_PDF_LOG_END, PIXELS_TO_PDF_LOG_START, IsolationProvider
# Define startupinfo for subprocesses # Define startupinfo for subprocesses
if platform.system() == "Windows": if platform.system() == "Windows":
@ -227,6 +227,17 @@ class Container(IsolationProvider):
for line in pixels_to_pdf_proc.stdout: for line in pixels_to_pdf_proc.stdout:
self.parse_progress_trusted(document, line.decode()) self.parse_progress_trusted(document, line.decode())
error_code = pixels_to_pdf_proc.wait() error_code = pixels_to_pdf_proc.wait()
# In case of a dev run, log everything from the second container.
if getattr(sys, "dangerzone_dev", False):
assert pixels_to_pdf_proc.stderr
out = pixels_to_pdf_proc.stderr.read().decode()
text = (
f"Conversion output: (pixels to PDF)\n"
f"{PIXELS_TO_PDF_LOG_START}\n{out}\n{PIXELS_TO_PDF_LOG_END}"
)
log.info(text)
if error_code != 0: if error_code != 0:
log.error("pixels-to-pdf failed") log.error("pixels-to-pdf failed")
raise errors.exception_from_error_code(error_code) raise errors.exception_from_error_code(error_code)