X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Ftermconfig.py;h=b9517f0af80284be60df5a4c4a6ef87bbaa9f9e9;hb=80feca2b9c331cab9a8657de8a587695c7aaac8d;hp=f481a84ff514fcd3b2cb475661453178b796b64b;hpb=5e1e7a4d37a1e149d5e899dada7b55a863cd8e64;p=loctrkd.git diff --git a/gps303/termconfig.py b/gps303/termconfig.py index f481a84..b9517f0 100644 --- a/gps303/termconfig.py +++ b/gps303/termconfig.py @@ -17,13 +17,12 @@ def runserver(conf): zctx = zmq.Context() zsub = zctx.socket(zmq.SUB) zsub.connect(conf.get("collector", "publishurl")) - for protoname in ( - "STATUS", - "SETUP", - "POSITION_UPLOAD_INTERVAL", + for proto in ( + STATUS.PROTO, + SETUP.PROTO, + POSITION_UPLOAD_INTERVAL.PROTO, ): - tosub = topic(proto_by_name(protoname)) - zsub.setsockopt(zmq.SUBSCRIBE, tosub) + zsub.setsockopt(zmq.SUBSCRIBE, topic(proto)) zpush = zctx.socket(zmq.PUSH) zpush.connect(conf.get("collector", "listenurl")) @@ -63,7 +62,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)