Log pdflatex output on error (1.7) (#669)

minvws · Apr 5, 2023 · 3eac7c7 · 3eac7c7
1 parent 6a72205
commit 3eac7c7
Showing 1 changed file with 16 additions and 23 deletions.
diff --git a/keiko/keiko/keiko.py b/keiko/keiko/keiko.py
@@ -121,29 +121,22 @@ def generate_report(
             tex_output_file_name,
         ]
         env = {**os.environ, "TEXMFVAR": tmp_dirname}
-        output = subprocess.run(cmd, cwd=tmp_dirname, env=env, capture_output=True, check=False)
-        logger.info(
-            "pdflatex run. [report_id=%s] [template=%s] [command=%s]",
-            report_id,
-            template_name,
-            " ".join(cmd),
-        )
-        logger.debug(output.stdout.decode("utf-8"))
-        logger.debug(output.stderr.decode("utf-8"))
-        if output.returncode:
-            raise Exception("Error running pdflatex")
-
-        output = subprocess.run(cmd, cwd=tmp_dirname, env=env, capture_output=True, check=False)
-        logger.info(
-            "pdflatex run. [report_id=%s] [template=%s] [command=%s]",
-            report_id,
-            template_name,
-            " ".join(cmd),
-        )
-        logger.debug(output.stdout.decode("utf-8"))
-        logger.debug(output.stderr.decode("utf-8"))
-        if output.returncode:
-            raise Exception("Error running pdflatex")
+        for i in (1, 2):
+            output = subprocess.run(cmd, cwd=tmp_dirname, env=env, capture_output=True, check=False)
+            logger.info(
+                "pdflatex [run=%d] [report_id=%s] [template=%s] [command=%s]",
+                i,
+                report_id,
+                template_name,
+                " ".join(cmd),
+            )
+            if output.returncode:
+                logger.error("stdout: %s", output.stdout.decode("utf-8"))
+                logger.error("stderr: %s", output.stderr.decode("utf-8"))
+                raise Exception("Error in pdflatex run %d", i)
+            else:
+                logger.debug(output.stdout.decode("utf-8"))
+                logger.debug(output.stderr.decode("utf-8"))
 
         # copy result back to output folder
         Path(settings.reports_folder).mkdir(parents=True, exist_ok=True)