Rename gps303proto to zx303proto

[loctrkd.git] / gps303 / storage.py

diff --git a/gps303/storage.py b/gps303/storage.py
index 9237871d862a2ca6b4dabc7e466114303fbd9960..c9ac6039b66a7c56da41cec5a3b8a2b33c01afe7 100644 (file)
--- a/gps303/storage.py
+++ b/gps303/storage.py
@@ -1,50 +1,50 @@
 """ Store zmq broadcasts to sqlite """
 
+from configparser import ConfigParser
 from datetime import datetime, timezone
-from getopt import getopt
 from logging import getLogger
-from logging.handlers import SysLogHandler
-import sys
-from time import time
 import zmq
 
 from . import common
 from .evstore import initdb, stow
-from .gps303proto import parse_message
+from .zx303proto import proto_of_message
 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"")
 
     try:
         while True:
             zmsg = Bcast(zsub.recv())
-            msg = parse_message(zmsg.packet)
-            log.debug("IMEI %s from %s at %s: %s", zmsg.imei, zmsg.peeraddr, datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc), msg)
-            if zmsg.peeraddr is not None:
-                addr, port = zmsg.peeraddr
-                peeraddr = str(addr), port
-            else:
-                peeraddr = None
-            stow(
-                peeraddr,
-                zmsg.when,
+            log.debug(
+                "%s IMEI %s from %s at %s: %s",
+                "I" if zmsg.is_incoming else "O",
                 zmsg.imei,
-                msg.length,
-                msg.PROTO,
-                msg.payload,
+                zmsg.peeraddr,
+                datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
+                zmsg.packet.hex(),
+            )
+            stow(
+                is_incoming=zmsg.is_incoming,
+                peeraddr=str(zmsg.peeraddr),
+                when=zmsg.when,
+                imei=zmsg.imei,
+                proto=proto_of_message(zmsg.packet),
+                packet=zmsg.packet,
             )
     except KeyboardInterrupt:
-        pass
+        zsub.close()
+        zctx.destroy()  # type: ignore
 
 
 if __name__.endswith("__main__"):