Multiprotocol support in zmq messages and storage

[loctrkd.git] / gps303 / termconfig.py

diff --git a/gps303/termconfig.py b/gps303/termconfig.py
index b9517f0af80284be60df5a4c4a6ef87bbaa9f9e9..6ec43fdc1c25f5063096121b459008d6fc3c5511 100644 (file)
--- a/gps303/termconfig.py
+++ b/gps303/termconfig.py
@@ -1,5 +1,6 @@
 """ For when responding to the terminal is not trivial """
 
+from configparser import ConfigParser
 from datetime import datetime, timezone
 from logging import getLogger
 from struct import pack
@@ -12,18 +13,18 @@ from .zmsg import Bcast, Resp, topic
 log = getLogger("gps303/termconfig")
 
 
-def runserver(conf):
-    termconfig = common.normconf(conf["termconfig"])
-    zctx = zmq.Context()
-    zsub = zctx.socket(zmq.SUB)
+def runserver(conf: ConfigParser) -> None:
+    # Is this https://github.com/zeromq/pyzmq/issues/1627 still not fixed?!
+    zctx = zmq.Context()  # type: ignore
+    zsub = zctx.socket(zmq.SUB)  # type: ignore
     zsub.connect(conf.get("collector", "publishurl"))
     for proto in (
-        STATUS.PROTO,
-        SETUP.PROTO,
-        POSITION_UPLOAD_INTERVAL.PROTO,
+        proto_name(STATUS),
+        proto_name(SETUP),
+        proto_name(POSITION_UPLOAD_INTERVAL),
     ):
         zsub.setsockopt(zmq.SUBSCRIBE, topic(proto))
-    zpush = zctx.socket(zmq.PUSH)
+    zpush = zctx.socket(zmq.PUSH)  # type: ignore
     zpush.connect(conf.get("collector", "listenurl"))
 
     try:
@@ -41,6 +42,12 @@ def runserver(conf):
                 log.error(
                     "%s does not expect externally provided response", msg
                 )
+            if zmsg.imei is not None and conf.has_section(zmsg.imei):
+                termconfig = common.normconf(conf[zmsg.imei])
+            elif conf.has_section("termconfig"):
+                termconfig = common.normconf(conf["termconfig"])
+            else:
+                termconfig = {}
             kwargs = {}
             if isinstance(msg, STATUS):
                 kwargs = {
@@ -69,7 +76,9 @@ def runserver(conf):
             zpush.send(resp.packed)
 
     except KeyboardInterrupt:
-        pass
+        zsub.close()
+        zpush.close()
+        zctx.destroy()  # type: ignore
 
 
 if __name__.endswith("__main__"):