typeckecking: annotate storage.py

[loctrkd.git] / gps303 / storage.py

diff --git a/gps303/storage.py b/gps303/storage.py
index 38ffaae863e979eb93fca5e948e516eaa497dae3..b6f84ce993e4356c4e8f32e43946f27bf12ce846 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"")
 
@@ -25,19 +27,16 @@ def runserver(conf):
         while True:
             zmsg = Bcast(zsub.recv())
             log.debug(
-                "IMEI %s from %s at %s: %s",
+                "%s IMEI %s from %s at %s: %s",
+                "I" if zmsg.is_incoming else "O",
                 zmsg.imei,
                 zmsg.peeraddr,
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 zmsg.packet.hex(),
             )
-            if zmsg.peeraddr is not None:
-                addr, port = zmsg.peeraddr
-                peeraddr = str((str(addr), port))
-            else:
-                peeraddr = None
             stow(
-                peeraddr=peeraddr,
+                is_incoming=zmsg.is_incoming,
+                peeraddr=str(zmsg.peeraddr),
                 when=zmsg.when,
                 imei=zmsg.imei,
                 proto=proto_of_message(zmsg.packet),