From 02602b072aee619cda7cda647f0be44263f959d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Wed, 15 Jan 2025 11:32:11 +0100 Subject: [PATCH] Remove intermediate variables for conversion start/end logs Also, state that the logs are incomplete in the header. --- dangerzone/isolation_provider/base.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dangerzone/isolation_provider/base.py b/dangerzone/isolation_provider/base.py index 4a074a5..cd08507 100644 --- 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(