cgse 0.16.9__tar.gz → 0.16.10__tar.gz

{cgse-0.16.9 → cgse-0.16.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse
-Version: 0.16.9
+Version: 0.16.10
 Summary: Generic Common-EGSE: Commanding and monitoring lab equipment
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

{cgse-0.16.9 → cgse-0.16.10}/docs/libs/cgse-common/settings.md

@@ -39,8 +39,8 @@ Settings
 │   ├── METRICS_PORT: 7003
 │   ├── MAX_NR_LOG_FILES: 20
 │   ├── MAX_SIZE_LOG_FILES: 20
-│   ├── TEXTUALOG_IP_ADDRESS: 127.0.0.1
-│   └── TEXTUALOG_LISTENING_PORT: 19996
+│   ├── EXTERN_LOG_HOST: 127.0.0.1
+│   └── EXTERN_LOG_PORT: 19996
 ├── Configuration Manager Control Server
 │   ├── PROTOCOL: tcp
 │   ├── HOSTNAME: localhost
@@ -146,8 +146,8 @@ Logging Control Server:                          # LOG_CS
     METRICS_PORT:                  7003          # The HTTP port where Prometheus will connect to for retrieving metrics
     MAX_NR_LOG_FILES:                20          # The maximum number of log files that will be maintained in a roll-over
     MAX_SIZE_LOG_FILES:              20          # The maximum size one log file can become
-    TEXTUALOG_IP_ADDRESS:     127.0.0.1          # The IP address of the textualog listening server
-    TEXTUALOG_LISTENING_PORT:     19996          # The port number on which the textualog server is listening
+    EXTERN_LOG_HOST:          127.0.0.1          # The IP address of the external logger 
+    EXTERN_LOG_PORT:              19996          # The port number on which the external logger is listening
 
 Configuration Manager Control Server:            # CM_CS
 

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-common/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-common"
-version = "0.16.9"
+version = "0.16.10"
 description = "Software framework to support hardware testing"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-coordinates/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-coordinates"
-version = "0.16.9"
+version = "0.16.10"
 description = "Reference Frames and Coordinate Transofrmations for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-core"
-version = "0.16.9"
+version = "0.16.10"
 description = "Core services for the CGSE framework"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/src/cgse_core/settings.yaml

@@ -18,8 +18,8 @@ Logging Control Server:                          # LOG_CS
     MAX_SIZE_LOG_FILES:              20          # The maximum size one log file can become
     RECEIVER_PORT:                 6105
     COMMANDER_PORT:                6106
-    TEXTUALOG_IP_ADDRESS:     127.0.0.1          # The IP address of the textualog listening server
-    TEXTUALOG_LISTENING_PORT:     19996          # The port number on which the textualog server is listening
+    EXTERN_LOG_HOST:          127.0.0.1          # The IP address of the external logger
+    EXTERN_LOG_PORT:             19996          # The port number on which the external logger is listening
 
 Configuration Manager Control Server:            # CM_CS
 

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/src/egse/logger/__init__.py

@@ -35,6 +35,7 @@ import zmq
 from egse.log import LOG_FORMAT_FULL
 from egse.log import PackageFilter
 from egse.log import egse_logger
+from egse.log import get_log_level_from_env
 from egse.log import logger
 from egse.log import root_logger
 from egse.registry.client import RegistryClient
@@ -201,7 +202,7 @@ def setup_logging():
 
     logging.disable(logging.NOTSET)
     for handler in root_logger.handlers:
-        handler.setLevel(logging.INFO)
+        handler.setLevel(get_log_level_from_env())
 
     egse_logger.setLevel(logging.DEBUG)
 

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/src/egse/logger/log_cs.py

@@ -144,9 +144,9 @@ def start():
     stream_handler.setFormatter(stream_formatter)
     stream_handler.addFilter(PackageFilter())
 
-    # Log records are also sent to the textualog listening server
+    # Log records are also sent to the external logger
 
-    socket_handler = SocketHandler(CTRL_SETTINGS.TEXTUALOG_IP_ADDRESS, CTRL_SETTINGS.TEXTUALOG_LISTENING_PORT)
+    socket_handler = SocketHandler(CTRL_SETTINGS.EXTERN_LOG_HOST, CTRL_SETTINGS.EXTERN_LOG_PORT)
     socket_handler.addFilter(PackageFilter())
     socket_handler.setFormatter(file_formatter)
 

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/src/egse/registry/client.py

@@ -114,8 +114,9 @@ class RegistryClient:
         self.poller.register(self.sub_socket, zmq.POLLIN)
 
     def _connect_hb_socket(self):
-        self.hb_socket = self.context.socket(zmq.REQ)
+        self.hb_socket = self.context.socket(zmq.DEALER)
         self.hb_socket.setsockopt(zmq.LINGER, 0)  # Don't wait for unsent messages on close()
+        self.hb_socket.setsockopt(zmq.IDENTITY, self._client_id)
         self.hb_socket.connect(self.registry_hb_endpoint)
 
     def disconnect(self):
@@ -214,9 +215,6 @@ class RegistryClient:
                 return response
             else:
                 self.logger.error(f"Request timed out after {HEART_BEAT_TIMEOUT:.2f}s")
-                self._disconnect_hb_socket()
-                time.sleep(HEART_BEAT_RECONNECT)
-                self._connect_hb_socket()
                 return {"success": False, "error": "Request timed out"}
 
         except zmq.ZMQError as exc:
@@ -473,14 +471,14 @@ class RegistryClient:
 
                     # Do a health check
                     if not self.health_check():
-                        self.logger.warning("ServiceRegistry not responding.")
+                        self.logger.warning("Heartbeat failed: ServiceRegistry not responding.")
                         return
                     else:
-                        self.logger.info("Health check succeeded, reregistering...")
+                        self.logger.info("Heartbeat failed, but health check succeeded, reregistering...")
                         self.reregister()
 
                 else:
-                    self.logger.debug(response.get("message"))
+                    self.logger.debug(f"Heartbeat succeeded: {response.get('message')}")
 
             except Exception as exc:
                 self.logger.error(f"Error sending heartbeat: {exc}")
@@ -603,8 +601,9 @@ class AsyncRegistryClient:
         self.sub_socket.setsockopt_string(zmq.SUBSCRIBE, "")
 
     def _connect_hb_socket(self):
-        self.hb_socket = self.context.socket(zmq.REQ)
+        self.hb_socket = self.context.socket(zmq.DEALER)
         self.hb_socket.setsockopt(zmq.LINGER, 0)  # Don't wait for unsent messages on close()
+        self.hb_socket.setsockopt(zmq.IDENTITY, self._client_id)
         self.hb_socket.connect(self.registry_hb_endpoint)
 
     def disconnect(self):
@@ -698,11 +697,8 @@ class AsyncRegistryClient:
                 return response
             except asyncio.TimeoutError:
                 self.logger.error(f"Heartbeat request timed out after {HEART_BEAT_TIMEOUT:.2f}s")
-                # Reset the socket to avoid invalid state
-                self._disconnect_hb_socket()
-                await asyncio.sleep(HEART_BEAT_RECONNECT)
-                self._connect_hb_socket()
                 return {"success": False, "error": "Heartbeat request timed out"}
+
         except zmq.ZMQError as exc:
             self.logger.error(f"ZMQ error: {exc}", exc_info=True)
             return {"success": False, "error": str(exc)}
@@ -858,14 +854,14 @@ class AsyncRegistryClient:
 
                             # Do a health check
                             if not await self.health_check():
-                                self.logger.warning("ServiceRegistry not responding.")
+                                self.logger.warning("Heartbeat failed: ServiceRegistry not responding.")
                                 continue
                             else:
-                                self.logger.info("Health check succeeded, reregistering...")
+                                self.logger.info("Heartbeat failed, but health check succeeded, reregistering...")
                                 await self.reregister()
 
                         else:
-                            self.logger.debug(response.get("message"))
+                            self.logger.debug(f"Heartbeat succeeded: {response.get('message')}")
                     except Exception as exc:
                         self.logger.error(f"Error in heartbeat loop: {exc}", exc_info=True)
 

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/src/egse/registry/server.py

@@ -101,19 +101,19 @@ class AsyncRegistryServer:
         req_rep_endpoint = f"tcp://*:{self.req_port}"
         self.req_socket = self.context.socket(zmq.ROUTER)
         self.req_socket.bind(req_rep_endpoint)
-        self.logger.info(f"Binding request socket to {req_rep_endpoint}")
+        self.logger.debug(f"Binding request ROUTER socket to {req_rep_endpoint}")
 
         # Socket to publish service events
         pub_endpoint = f"tcp://*:{self.pub_port}"
         self.pub_socket = self.context.socket(zmq.PUB)
         self.pub_socket.bind(pub_endpoint)
-        self.logger.info(f"Binding publish socket to {pub_endpoint}")
+        self.logger.debug(f"Binding publish PUB socket to {pub_endpoint}")
 
         # Socket to handle heartbeats
         hb_endpoint = f"tcp://*:{self.hb_port}"
-        self.hb_socket = self.context.socket(zmq.REP)
+        self.hb_socket = self.context.socket(zmq.ROUTER)
         self.hb_socket.bind(hb_endpoint)
-        self.logger.info(f"Binding heartbeat socket to {hb_endpoint}")
+        self.logger.debug(f"Binding heartbeat ROUTER socket to {hb_endpoint}")
 
     async def initialize_backend(self):
         """Initialize the storage backend."""
@@ -137,8 +137,8 @@ class AsyncRegistryServer:
 
         self._running = True
         self.logger.info(
-            f"Async registry server started on ports {self.req_port} (ROUTER-DEALER), {self.pub_port} (PUB), "
-            f"and {self.hb_port} (Heartbeat)"
+            f"Async registry server started on ports {self.req_port} (Requests ROUTER-DEALER), "
+            f"{self.pub_port} (Publish PUB), and {self.hb_port} (Heartbeat ROUTER)"
         )
 
         # Start the cleanup task
@@ -400,22 +400,35 @@ class AsyncRegistryServer:
         self.logger.info("Started heartbeats handler task")
 
         try:
+            message_parts = None
             while self._running:
                 try:
                     # Receive heartbeat (non-blocking with timeout)
-                    message_json = await asyncio.wait_for(self.hb_socket.recv_string(), timeout=1.0)
+                    message_parts = await asyncio.wait_for(self.hb_socket.recv_multipart(), timeout=1.0)
+
+                    self.logger.debug(f"{message_parts=}")
+
+                    if len(message_parts) == 2:
+                        client_id = message_parts[0]
+                        request = message_parts[1]
+
+                        # Parse the request
+                        request = json.loads(request)
+                        self.logger.info(f"Received heartbeat request: {request}")
 
-                    # Parse the request
-                    request = json.loads(message_json)
-                    self.logger.info(f"Received heartbeat request: {request}")
+                        response = await self._handle_renew(request)
+                        if VERBOSE_DEBUG:
+                            self.logger.debug(f"{response=}")
 
-                    response = await self._handle_renew(request)
+                        # Send the response
+                        await self.hb_socket.send_multipart([client_id, json.dumps(response).encode()])
 
-                    # Send the response
-                    await self.hb_socket.send_string(json.dumps(response))
+                    else:
+                        self.logger.warning("Heartbeat request: message corrupted, check debug messages.")
 
                 except asyncio.TimeoutError:
-                    # self.logger.debug("waiting for heartbeat...")
+                    if VERBOSE_DEBUG:
+                        self.logger.debug("waiting for heartbeat...")
                     continue
 
                 except Exception as exc:
@@ -526,12 +539,6 @@ async def start(
 ):
     """Run the registry server with signal handling."""
 
-    logging.basicConfig(
-        level=get_logging_level(log_level),
-        format="[%(asctime)s] %(threadName)-12s %(levelname)-8s %(name)-12s %(lineno)5d:%(module)-20s %(message)s",
-    )
-    logging.getLogger("aiosqlite").setLevel(logging.INFO)
-
     with remote_logging():
         server = AsyncRegistryServer(
             req_port=req_port,

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-core/tests/script_test_registry_client_server.py

@@ -30,7 +30,6 @@ Notes:
 """
 
 import asyncio
-import logging
 import sys
 import time
 
@@ -88,7 +87,7 @@ def test_proper_termination_of_tasks_sync(
     assert response["name"] == "sync-context-test-service"
     assert response["metadata"]["msg"] == "Hello, World!"
 
-    print("Sleeping for 10s to let some heartbeats come through...")
+    print("Sleeping for 50s to let some heartbeats come through...")
     time.sleep(50.0)
 
     client.stop_heartbeat()
@@ -134,8 +133,8 @@ async def test_proper_termination_of_tasks_async(
     assert response["name"] == "async-context-test-service"
     assert response["metadata"]["msg"] == "Hello, World!"
 
-    print("Sleeping for 10s to let some heartbeats come through...")
-    await asyncio.sleep(10.0)
+    print("Sleeping for 50s to let some heartbeats come through...")
+    await asyncio.sleep(50.0)
 
     await client.stop_heartbeat()
     await client.deregister(service_id)
@@ -166,9 +165,4 @@ def main(
 
 
 if __name__ == "__main__":
-    logging.basicConfig(
-        level=logging.DEBUG,
-        format="[%(asctime)s] %(threadName)-12s %(levelname)-8s %(name)-12s %(lineno)5d:%(module)-20s %(message)s",
-    )
-
     sys.exit(app())

{cgse-0.16.9 → cgse-0.16.10}/libs/cgse-gui/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-gui"
-version = "0.16.9"
+version = "0.16.10"
 description = "GUI components for CGSE"
 authors = [
     {name = "Rik Huygen", email = "rik.huygen@kuleuven.be"},

{cgse-0.16.9 → cgse-0.16.10}/projects/generic/cgse-tools/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-tools"
-version = "0.16.9"
+version = "0.16.10"
 description = "Tools for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/projects/generic/keithley-tempcontrol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "keithley-tempcontrol"
-version = "0.16.9"
+version = "0.16.10"
 description = "Keithley Temperature Control for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/projects/generic/lakeshore-tempcontrol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lakeshore-tempcontrol"
-version = "0.16.9"
+version = "0.16.10"
 description = "Lakeshore Temperature Control for CGSE"
 authors = [
     {name = "IVS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/projects/generic/symetrie-hexapod/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "symetrie-hexapod"
-version = "0.16.9"
+version = "0.16.10"
 description = "Symetrie Hexapod implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/projects/plato/plato-fits/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-fits"
-version = "0.16.9"
+version = "0.16.10"
 description = "FITS Persistence implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/projects/plato/plato-hdf5/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-hdf5"
-version = "0.16.9"
+version = "0.16.10"
 description = "HDF5 Persistence sub-class for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/projects/plato/plato-spw/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-spw"
-version = "0.16.9"
+version = "0.16.10"
 description = "SpaceWire implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.16.9 → cgse-0.16.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse"
-version = "0.16.9"
+version = "0.16.10"
 description = "Generic Common-EGSE: Commanding and monitoring lab equipment"
 authors = [
     {name = "IvS KU Leuven"}