WIP retoure messaging

[loctrkd.git] / gps303 / watch.py

diff --git a/gps303/watch.py b/gps303/watch.py
index 8ae9ab99bce84206084c91b0e21950ae65b066d9..2e5b412fb89c87c98d0338ff3069f934f3132896 100644 (file)
--- a/gps303/watch.py
+++ b/gps303/watch.py
@@ -5,7 +5,8 @@ from logging import getLogger
 import zmq
 
 from . import common
-from .zmsg import LocEvt
+from .gps303proto import parse_message
+from .zmsg import Bcast
 
 log = getLogger("gps303/watch")
 
@@ -13,13 +14,14 @@ log = getLogger("gps303/watch")
 def runserver(conf):
     zctx = zmq.Context()
     zsub = zctx.socket(zmq.SUB)
-    zsub.connect(conf.get("lookaside", "publishurl"))
+    zsub.connect(conf.get("collector", "publishurl"))
     zsub.setsockopt(zmq.SUBSCRIBE, b"")
 
     try:
         while True:
-            zmsg = LocEvt(zsub.recv())
-            print(zmsg)
+            zmsg = Bcast(zsub.recv())
+            msg = parse_message(zmsg.packet, zmsg.is_incoming)
+            print("I" if zmsg.is_incoming else "O", zmsg.imei, msg)
     except KeyboardInterrupt:
         pass