Merge 62262a139f into 1298e9c398

Remove intermediate variables for conversion start/end logs
Also, state that the logs are incomplete in the header.
2025-05-17 10:41:49 +02:00 · 2025-01-15 16:13:23 +01:00 · 2025-01-15 16:13:10 +01:00 · 2025-01-15 16:12:45 +01:00
1 changed files with 3 additions and 7 deletions
--- a/dangerzone/isolation_provider/base.py
+++ b/dangerzone/isolation_provider/base.py
@ -20,9 +20,6 @@ from ..util import get_tessdata_dir, replace_control_chars

 log = logging.getLogger(__name__)

-DOC_TO_PIXELS_LOG_START = "----- DOC TO PIXELS LOG START -----"
-DOC_TO_PIXELS_LOG_END = "----- DOC TO PIXELS LOG END -----"
-
 TIMEOUT_EXCEPTION = 15
 TIMEOUT_GRACE = 15
 TIMEOUT_FORCE = 5
@ -359,14 +356,13 @@ class IsolationProvider(ABC):
                debug_bytes = stderr.getvalue()
                debug_log = sanitize_debug_text(debug_bytes)

-                incomplete = "(incomplete)\n" if stderr_thread.is_alive() else ""
+                incomplete = "(incomplete) " if stderr_thread.is_alive() else ""

                log.info(
                    "Conversion output (doc to pixels)\n"
-                    f"{DOC_TO_PIXELS_LOG_START}\n"
+                    f"----- DOC TO PIXELS LOG START {incomplete}-----\n"
                    f"{debug_log}"  # no need for an extra newline here
-                    f"{incomplete}"
-                    f"{DOC_TO_PIXELS_LOG_END}"
+                    "----- DOC TO PIXELS LOG END -----"
                )

    def start_stderr_thread(
Author	SHA1	Message	Date
Alexis Métaireau	daf9b627ac	Merge `62262a139f` into `1298e9c398`	2025-01-15 16:13:23 +01:00
Alexis Métaireau	62262a139f	Remove intermediate variables for conversion start/end logs Also, state that the logs are incomplete in the header.	2025-01-15 16:13:10 +01:00
Alexis Métaireau	c8eaf0455d	Add a `--debug` flag to the CLI to help retrieve more logs When the flag is set, the `RUNSC_DEBUG=1` environment variable is added to the outer container, and stderr is captured in a separate thread, before printing its output.	2025-01-15 16:12:45 +01:00