Pass debug through to merged-results. #1434

perfsonar · Jul 9, 2024 · 57e75db · 57e75db
1 parent a6d9739
commit 57e75db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pscheduler-server/pscheduler-server/daemons/runner b/pscheduler-server/pscheduler-server/daemons/runner
@@ -681,9 +681,13 @@ class RunWorker(pscheduler.GenericWorker):
             merge_input_text = pscheduler.json_dump(merge_input)
             self.log_debug("%d: Merging %s", self.id, merge_input_text)
 
+            # Child_env sill still be valid from when we ran the 'run'
+            # method above.
             returncode, stdout, stderr = pscheduler.plugin_invoke(
                 "tool", tool, "merged-results",
-                stdin=merge_input_text, timeout=5)
+                stdin=merge_input_text,
+                env_add=child_env,
+                timeout=5)
 
             self.log_debug("%d: Merged results: %d %s %s", self.id, returncode, stdout, stderr)
 

diff --git a/pscheduler-tool-snooze/snooze/merged-results b/pscheduler-tool-snooze/snooze/merged-results
@@ -6,7 +6,9 @@
 
 import pscheduler
 
+log = pscheduler.Log(prefix="tool-snooze", quiet=True)
 input = pscheduler.json_load(exit_on_error=True);
+log.debug("Input to merged results: %s" % input)
 
 # TODO: Validate the input