From 951562e58c7aa45200e0b6a3967c6c73e12de070 Mon Sep 17 00:00:00 2001
From: Tobias Persson <tobiaspn@axis.com>
Date: Mon, 29 Jul 2024 13:33:27 +0200
Subject: [PATCH] Log listener to read IDENTIFIER environment variable if it
 exists

---
 .../log_listener/src/log_listener/listener.py | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/projects/log_listener/src/log_listener/listener.py b/projects/log_listener/src/log_listener/listener.py
index 9636bc5..fd34c5f 100644
--- a/projects/log_listener/src/log_listener/listener.py
+++ b/projects/log_listener/src/log_listener/listener.py
@@ -33,7 +33,7 @@
 class Listener(threading.Thread):
     """Listen to log messages from ETOS executions."""
 
-    __tercc = None
+    __identifier = None
     __stop = False
     rabbitmq = None
     logger = logging.getLogger(__name__)
@@ -41,7 +41,6 @@ class Listener(threading.Thread):
     def __init__(self, lock: threading.Lock, log_file: pathlib.Path, event_file: pathlib.Path):
         """Initialize ETOS library."""
         super().__init__()
-        self.identifier = self.tercc.meta.event_id
         self.lock = lock
         self.log_file = log_file
         self.event_file = event_file
@@ -49,14 +48,22 @@ def __init__(self, lock: threading.Lock, log_file: pathlib.Path, event_file: pat
             with self.event_file.open() as _event_file:
                 self.id = len(_event_file.readlines()) + 1
 
+    @property
+    def identifier(self) -> str:
+        """Get ETOS identifier from environment."""
+        if self.__identifier is None:
+            if os.getenv("IDENTIFIER") is not None:
+                self.__identifier = os.getenv("IDENTIFIER", "Unknown")
+            else:
+                self.__identifier = self.tercc.meta.event_id
+        return self.__identifier
+
     @property
     def tercc(self) -> EiffelTestExecutionRecipeCollectionCreatedEvent:
         """Test execution recipe collection created event from environment."""
-        if self.__tercc is None:
-            tercc = EiffelTestExecutionRecipeCollectionCreatedEvent()
-            tercc.rebuild(json.loads(os.getenv("TERCC")))
-            self.__tercc = tercc
-        return self.__tercc
+        tercc = EiffelTestExecutionRecipeCollectionCreatedEvent()
+        tercc.rebuild(json.loads(os.getenv("TERCC")))
+        return tercc
 
     def new_event(self, event: dict, _: Optional[str] = None) -> None:
         """Get a new event from the internal RabbitMQ bus and write it to file."""