Merge branch 'sc/ots_ops' of https://github.com/art-daq/artdaq-daqinterface into sc/ots_ops

Author: corrodis

rc/control/daqinterface.py

@@ -727,7 +727,9 @@ def _timing_trace_init(self):
             self._timing_trace_depth = 0
 
     def timing_trace(self, event, stage, elapsed_s=None, extra_fields=None):
-        if not self.timing_trace_is_enabled():
+        if not self.timing_trace_is_enabled() or getattr(
+            self, "_timing_trace_failed", False
+        ):
             return
 
         self._timing_trace_init()
@@ -3757,7 +3759,10 @@ def do_config(self, subconfigs_for_run=[]):
                 self.timing_trace_end(
                     "do_config_resolve_fhicl",
                     resolve_fhicl_start,
-                    {"result": "update_fhicl_exception", "label": self.procinfos[i_proc].label},
+                    {
+                        "result": "update_fhicl_exception",
+                        "label": self.procinfos[i_proc].label,
+                    },
                 )
                 self.timing_trace_end(
                     "do_config_total", do_config_start, {"result": "failure"}
@@ -3979,9 +3984,7 @@ def do_config(self, subconfigs_for_run=[]):
             )
 
         self.print_log("i", "\n%s: CONFIG transition complete" % (date_and_time()))
-        self.timing_trace_end(
-            "do_config_total", do_config_start, {"result": "success"}
-        )
+        self.timing_trace_end("do_config_total", do_config_start, {"result": "success"})
         return "done"
 
     def do_start_running(self, run_number=None):

rc/control/manage_processes_direct.py

@@ -158,7 +158,6 @@ def launch_procs_on_host(
     out, _ = proc.communicate()
     status = proc.returncode
 
-
     self.print_log("d", "out: %s " % out, executing_commands_debug_level)
     self.print_log("d", "status: %s " % status, executing_commands_debug_level)
 

rc/control/utilities.py

@@ -439,7 +439,6 @@ def construct_checked_command(cmds):
 
         checked_cmds.append(cmd)
 
-
         if not re.search(r"\s*&\s*$", cmd):
             check_cmd = (
                 'if [[ "$?" != "0" ]]; then echo %s: Nonzero return value from the following command: "%s" >> /tmp/daqinterface_checked_command_failures_%s.log; exit 1; fi '