cleanup extra handling

microsoft · Aug 1, 2023 · af6a6dc · af6a6dc
1 parent b653c21
commit af6a6dc
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/qcodes/logger/instrument_logger.py b/qcodes/logger/instrument_logger.py
@@ -41,13 +41,14 @@ def process(
         Returns the message and the kwargs for the handlers.
         """
         assert self.extra is not None
-        inst = self.extra['instrument']
-        kwargs["extra"] = {}
-        kwargs["extra"]["instrument_name"] = str(getattr(inst, "full_name", ""))
-        kwargs["extra"]["instrument_type"] = str(type(inst))
+        extra = dict(self.extra)
+        inst = extra.pop("instrument")
+
         full_name = getattr(inst, "full_name", None)
-        kwargs["extra"]["instrument_name"] = full_name
         instr_type = str(type(inst).__name__)
+
+        kwargs["extra"] = extra
+        kwargs["extra"]["instrument_name"] = str(full_name)
         kwargs["extra"]["instrument_type"] = instr_type
         return f"[{full_name}({instr_type})] {msg}", kwargs