X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=fb976a00acfd1a968aded27af08d72f4883faf17;hb=c4c37b80c38009b8e93d9e06705d400b325f6d2a;hp=ecd5dfa089cfbd03e0c2ff6795779d77b2e476d4;hpb=9d43b364c397f1f50bd8620e487cbc8fc7189f20;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index ecd5dfa..fb976a0 100644
--- a/gps303/lookaside.py
+++ b/gps303/lookaside.py
@@ -1,26 +1,29 @@
 """ 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
 from os import umask
 from struct import pack
 import zmq
 
 from . import common
-from .gps303proto import parse_message, proto_by_name, WIFI_POSITIONING
-from .opencellid import qry_cell
-from .zmsg import Bcast, Resp
+from .gps303proto import parse_message, WIFI_POSITIONING
+from .zmsg import Bcast, Resp, topic
 
 log = getLogger("gps303/lookaside")
 
 
-def runserver(conf):
-    zctx = zmq.Context()
-    zsub = zctx.socket(zmq.SUB)
+def runserver(conf: ConfigParser) -> None:
+    qry = import_module("." + conf.get("lookaside", "backend"), __package__)
+    qry.init(conf)
+    # 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"))
-    topic = pack("B", proto_by_name("WIFI_POSITIONING"))
-    zsub.setsockopt(zmq.SUBSCRIBE, topic)
-    zpush = zctx.socket(zmq.PUSH)
+    zsub.setsockopt(zmq.SUBSCRIBE, topic(WIFI_POSITIONING.PROTO))
+    zpush = zctx.socket(zmq.PUSH)  # type: ignore
     zpush.connect(conf.get("collector", "listenurl"))
 
     try:
@@ -34,23 +37,17 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            if not isinstance(msg, WIFI_POSITIONING):
-                log.error(
-                    "IMEI %s from %s at %s: %s",
-                    zmsg.imei,
-                    zmsg.peeraddr,
-                    datetime.fromtimestamp(zmsg.when).astimezone(
-                        tz=timezone.utc
-                    ),
-                    msg,
+            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,
                 )
-                continue
-            lat, lon = qry_cell(
-                conf["opencellid"]["dbfn"], msg.mcc, msg.gsm_cells
-            )
-            resp = Resp(imei=zmsg.imei, packet=msg.Out(lat=lat, lon=lon).packed)
-            log.debug("Response for lat=%s, lon=%s: %s", lat, lon, resp)
-            zpush.send(resp.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