X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=2e759d1ef109ec2a227d5f772ee981a6c0b2bf52;hb=bf48ccad4b4b91e7d7e09d1087f5953bc2db97d7;hp=7655f55e4bb095655b41d525aba89cf0a4b12c87;hpb=1888de5a5dd4bdb85f3fb745341920a9996b278e;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index 7655f55..2e759d1 100644
--- a/gps303/lookaside.py
+++ b/gps303/lookaside.py
@@ -1,5 +1,6 @@
 """ Estimate coordinates from WIFI_POSITIONING and send back """
 
+from configparser import ConfigParser
 from datetime import datetime, timezone
 from importlib import import_module
 from logging import getLogger
@@ -8,20 +9,21 @@ from struct import pack
 import zmq
 
 from . import common
-from .gps303proto import parse_message, WIFI_POSITIONING
+from .zx303proto import parse_message, proto_name, WIFI_POSITIONING
 from .zmsg import Bcast, Resp, topic
 
 log = getLogger("gps303/lookaside")
 
 
-def runserver(conf):
+def runserver(conf: ConfigParser) -> None:
     qry = import_module("." + conf.get("lookaside", "backend"), __package__)
     qry.init(conf)
-    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, topic(WIFI_POSITIONING.PROTO))
-    zpush = zctx.socket(zmq.PUSH)
+    zsub.setsockopt(zmq.SUBSCRIBE, topic(proto_name(WIFI_POSITIONING)))
+    zpush = zctx.socket(zmq.PUSH)  # type: ignore
     zpush.connect(conf.get("collector", "listenurl"))
 
     try:
@@ -36,7 +38,9 @@ def runserver(conf):
                 msg,
             )
             try:
-                lat, lon = qry.lookup(msg.mcc, msg.mnc, msg.gsm_cells, msg.wifi_aps)
+                lat, lon = qry.lookup(
+                    msg.mcc, msg.mnc, msg.gsm_cells, msg.wifi_aps
+                )
                 resp = Resp(
                     imei=zmsg.imei,
                     when=zmsg.when,  # not the current time, but the original!
@@ -48,7 +52,10 @@ def runserver(conf):
                 log.warning("Lookup for %s resulted in %s", msg, e)
 
     except KeyboardInterrupt:
-        pass
+        zsub.close()
+        zpush.close()
+        zctx.destroy()  # type: ignore
+        qry.shut()
 
 
 if __name__.endswith("__main__"):