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

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index 6924757..7655f55 100644
--- a/gps303/lookaside.py
+++ b/gps303/lookaside.py
@@ -15,12 +15,7 @@ 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"
-        )
+    qry = import_module("." + conf.get("lookaside", "backend"), __package__)
     qry.init(conf)
     zctx = zmq.Context()
     zsub = zctx.socket(zmq.SUB)
@@ -40,14 +35,17 @@ 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