full encoder/decoder for zmq messages

[loctrkd.git] / gps303 / storage.py

diff --git a/gps303/storage.py b/gps303/storage.py
index 9da1d6d7d1a475d5f0e2fbd7b4f83af26c83f363..6047c39bfc9686fd0a0643564a10007792209b4e 100644 (file)
--- a/gps303/storage.py
+++ b/gps303/storage.py
@@ -1,5 +1,6 @@
 """ Store zmq broadcasts to sqlite """
 
+from datetime import datetime, timezone
 from getopt import getopt
 from logging import getLogger
 from logging.handlers import SysLogHandler
@@ -10,9 +11,11 @@ import zmq
 from . import common
 from .evstore import initdb, stow
 from .gps303proto import parse_message
+from .zmsg import Bcast
 
 log = getLogger("gps303/storage")
 
+
 def runserver(conf):
     dbname = conf.get("storage", "dbfn")
     log.info('Using Sqlite3 database "%s"', dbname)
@@ -24,12 +27,17 @@ def runserver(conf):
 
     try:
         while True:
-            zmsg = zsub.recv()
-            imei = zmsg[1:17].decode()
-            packet = zmsg[17:]
-            msg = parse_message(packet)
-            log.debug("From IMEI %s: %s", imei, msg)
-            stow("", time(), imei, msg.length, msg.PROTO, msg.payload)
+            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)
+            stow(
+                zmsg.peeraddr,
+                zmsg.when,
+                zmsg.imei,
+                msg.length,
+                msg.PROTO,
+                msg.payload,
+            )
     except KeyboardInterrupt:
         pass