X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Ftermconfig.py;h=9f9168409d6ddd21b0abf746d2d21ce5eae251c8;hb=8bf5efdf4f5d069b108e6fd8140f5ebd930b538e;hp=771f988f038dc6785d7d34a5ff1b1164db476beb;hpb=9b5436a2e568931f38e5721cdcf2e42bab151619;p=loctrkd.git diff --git a/gps303/termconfig.py b/gps303/termconfig.py index 771f988..9f91684 100644 --- a/gps303/termconfig.py +++ b/gps303/termconfig.py @@ -7,7 +7,7 @@ import zmq from . import common from .gps303proto import * -from .zmsg import Bcast, Resp +from .zmsg import Bcast, Resp, topic log = getLogger("gps303/termconfig") @@ -22,8 +22,8 @@ def runserver(conf): "SETUP", "POSITION_UPLOAD_INTERVAL", ): - topic = pack("B", proto_by_name(protoname)) - zsub.setsockopt(zmq.SUBSCRIBE, topic) + tosub = topic(proto_by_name(protoname)) + zsub.setsockopt(zmq.SUBSCRIBE, tosub) zpush = zctx.socket(zmq.PUSH) zpush.connect(conf.get("collector", "listenurl")) @@ -63,7 +63,9 @@ def runserver(conf): ): if key in termconfig: kwargs[key] = termconfig[key] - resp = Resp(imei=zmsg.imei, packet=msg.Out(**kwargs).packed) + resp = Resp( + imei=zmsg.imei, when=zmsg.when, packet=msg.Out(**kwargs).packed + ) log.debug("Response: %s", resp) zpush.send(resp.packed)