X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Ftermconfig.py;h=953e6aec75f67ae380732d7f80dcfcc4cfa845ed;hb=b955a03a2d2146a705ac4d19047cc26b38cdd878;hp=b9517f0af80284be60df5a4c4a6ef87bbaa9f9e9;hpb=d6c20543cf997f20cb72bf7380674bf012a5af88;p=loctrkd.git diff --git a/gps303/termconfig.py b/gps303/termconfig.py index b9517f0..953e6ae 100644 --- a/gps303/termconfig.py +++ b/gps303/termconfig.py @@ -1,5 +1,6 @@ """ For when responding to the terminal is not trivial """ +from configparser import ConfigParser from datetime import datetime, timezone from logging import getLogger from struct import pack @@ -12,10 +13,10 @@ from .zmsg import Bcast, Resp, topic log = getLogger("gps303/termconfig") -def runserver(conf): - termconfig = common.normconf(conf["termconfig"]) - zctx = zmq.Context() - zsub = zctx.socket(zmq.SUB) +def runserver(conf: ConfigParser) -> None: + # 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")) for proto in ( STATUS.PROTO, @@ -23,7 +24,7 @@ def runserver(conf): POSITION_UPLOAD_INTERVAL.PROTO, ): zsub.setsockopt(zmq.SUBSCRIBE, topic(proto)) - zpush = zctx.socket(zmq.PUSH) + zpush = zctx.socket(zmq.PUSH) # type: ignore zpush.connect(conf.get("collector", "listenurl")) try: @@ -41,6 +42,10 @@ def runserver(conf): log.error( "%s does not expect externally provided response", msg ) + if zmsg.imei is not None and conf.has_section(zmsg.imei): + termconfig = common.normconf(conf[zmsg.imei]) + else: + termconfig = common.normconf(conf["termconfig"]) kwargs = {} if isinstance(msg, STATUS): kwargs = {