X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=0c1e4cdcf19e8ca0b22c8b73615bfa178939b313;hb=c3bc6d5bbdc0d0bf10e338c6e3bad1a519d5afa0;hp=6924757ec344a7992b8b3aed510f536ecef2c66a;hpb=5e1ae25333928e02eed519652256bee2e8e06671;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index 6924757..0c1e4cd 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,25 +9,21 @@ from struct import pack
 import zmq
 
 from . import common
-from .gps303proto import parse_message, WIFI_POSITIONING
+from .gps303proto import parse_message, proto_name, WIFI_POSITIONING
 from .zmsg import Bcast, Resp, topic
 
 log = getLogger("gps303/lookaside")
 
 
-def runserver(conf):
-    if conf.get("lookaside", "backend") == "opencellid":
-        qry = import_module(".opencellid", __package__)
-    else:
-        raise NotImplementedError(
-            "Lookaside only implements opencellid backend"
-        )
+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:
@@ -40,17 +37,25 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            lat, lon = qry.lookup(msg.mcc, msg.gsm_cells, msg.wifi_aps)
-            resp = Resp(
-                imei=zmsg.imei,
-                when=zmsg.when,  # not the current time, but the original!
-                packet=msg.Out(latitude=lat, longitude=lon).packed,
-            )
-            log.debug("Response for lat=%s, lon=%s: %s", lat, lon, resp)
-            zpush.send(resp.packed)
+            try:
+                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!
+                    packet=msg.Out(latitude=lat, longitude=lon).packed,
+                )
+                log.debug("Response for lat=%s, lon=%s: %s", lat, lon, resp)
+                zpush.send(resp.packed)
+            except Exception as e:
+                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__"):