From fc52d6baa6fc14aa5842d39dc0f433a8ba6475a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 4 Jan 2019 16:43:52 +0100
Subject: [PATCH] Also log override file contents when passing to Blender for
rendering
---
flamenco_worker/commands.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/flamenco_worker/commands.py b/flamenco_worker/commands.py
index e8b3821a..6f08fc91 100644
--- a/flamenco_worker/commands.py
+++ b/flamenco_worker/commands.py
@@ -763,13 +763,20 @@ class BlenderRenderCommand(AbstractSubprocessCommand):
# No '.blend' in the filepath. Weird.
pass
else:
- override_filepath = filepath[:index] + '-overrides.py'
- if Path(override_filepath).exists():
+ override_filename = filepath[:index] + '-overrides.py'
+ override_filepath = Path(override_filename)
+ if override_filepath.exists():
msg = f'Override file found in {override_filepath}'
self._log.info(msg)
await self.worker.register_log(msg)
- cmd.extend(['--python', override_filepath])
+ await self.worker.register_log(
+ f'Override file contains:\n{override_filepath.read_text("utf-8")}')
+
+ cmd.extend([
+ '--python-exit-code', '42',
+ '--python', override_filename,
+ ])
if settings.get('python_expr'):
cmd.extend(['--python-expr', settings['python_expr']])
--
GitLab