X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fcollector.py;h=de65394d4f4b5eefb0527bea384746cea5d5b2a0;hb=0c28fa6306f252934fe7e2c04522e8540c414387;hp=9f305e55f60197f38d84e820a793192bb93abbc2;hpb=01e993a49ac30b400940fc031cc94ef893fc7200;p=loctrkd.git diff --git a/gps303/collector.py b/gps303/collector.py index 9f305e5..de65394 100644 --- a/gps303/collector.py +++ b/gps303/collector.py @@ -166,7 +166,8 @@ def runserver(conf): while True: try: msg = zpull.recv(zmq.NOBLOCK) - tosend.append(Resp(msg)) + zmsg = Resp(msg) + tosend.append(zmsg) except zmq.Again: break elif sk == tcpfd: @@ -200,8 +201,8 @@ def runserver(conf): tostop.append(sk) respmsg = inline_response(packet) if respmsg is not None: - clients.response( - Resp(imei=imei, packet=respmsg) + tosend.append( + Resp(imei=imei, when=when, packet=respmsg) ) else: log.debug("Stray event: %s on socket %s", fl, sk) @@ -210,6 +211,15 @@ def runserver(conf): poller.unregister(fd) clients.stop(fd) for zmsg in tosend: + zpub.send( + Bcast( + is_incoming=False, + proto=proto_of_message(zmsg.packet), + when=zmsg.when, + imei=zmsg.imei, + packet=zmsg.packet, + ).packed + ) log.debug("Sending to the client: %s", zmsg) clients.response(zmsg) for clntsock, clntaddr in topoll: