logging debug

Author: skbarber

GEECS-Scanner-GUI/geecs_scanner/data_acquisition/data_logger.py

@@ -1329,14 +1329,7 @@ def _log_device_data(self, device: GeecsDevice, elapsed_time: float) -> None:
                 self.sound_player.play_beep()  # Play the beep sound
                 self.shot_index += 1
                 # Stamp the current shot number into the logging context
-                update_context(
-                    {
-                        "scan_id": getattr(
-                            self, "scan_number", "-"
-                        ),  # or pass it in from ScanManager
-                        "shot_id": str(self.shot_index),
-                    }
-                )
+                update_context({"shot_id": str(self.shot_index)})
 
             self.log_entries[elapsed_time].update(
                 {

GEECS-Scanner-GUI/geecs_scanner/logging_setup.py

@@ -193,14 +193,16 @@ def init_logging(
     _QUEUE = Queue(-1)
     root = logging.getLogger()
     root.setLevel(level)
-    root.handlers[:] = [logging.handlers.QueueHandler(_QUEUE)]
+    qh = logging.handlers.QueueHandler(_QUEUE)
+    root.handlers[:] = [qh]
+    # One shared ContextFilter; apply at handler level so *all* records get i
     global _CTX_FILTER
     _CTX_FILTER = ContextFilter(**(base_context or {"scan_id": "-", "shot_id": "-"}))
-    # Don't clear other filters; just add ours
-    root.addFilter(_CTX_FILTER)
+    qh.addFilter(_CTX_FILTER)  # inject before enqueue
 
     # Multiplexer for real sinks
     _MUX = MultiplexingHandler()
+    _MUX.addFilter(_CTX_FILTER)  # inject in listener thread before fan-out
 
     # Global rotating file
     gf = logging.handlers.RotatingFileHandler(