test: include lookaside and termconfig in the loop

[loctrkd.git] / gps303 / storage.py

diff --git a/gps303/storage.py b/gps303/storage.py
index 14afc49e1fde494f5aebcf96bb2582f572fe1de7..c0fc89be0ad3d41029faacbce17be5c76cafd207 100644 (file)
--- a/gps303/storage.py
+++ b/gps303/storage.py
@@ -1,5 +1,6 @@
 """ Store zmq broadcasts to sqlite """
 
+from configparser import ConfigParser
 from datetime import datetime, timezone
 from logging import getLogger
 import zmq
@@ -12,12 +13,13 @@ from .zmsg import Bcast
 log = getLogger("gps303/storage")
 
 
-def runserver(conf):
+def runserver(conf: ConfigParser) -> None:
     dbname = conf.get("storage", "dbfn")
     log.info('Using Sqlite3 database "%s"', dbname)
     initdb(dbname)
-    zctx = zmq.Context()
-    zsub = zctx.socket(zmq.SUB)
+    # 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"))
     zsub.setsockopt(zmq.SUBSCRIBE, b"")
 
@@ -41,7 +43,8 @@ def runserver(conf):
                 packet=zmsg.packet,
             )
     except KeyboardInterrupt:
-        pass
+        zsub.close()
+        zctx.destroy()  # type: ignore
 
 
 if __name__.endswith("__main__"):