only read/write if file specified in config

lowleveltgfilter
Simon 4 years ago
parent cdef086995
commit 777bf36c41
No known key found for this signature in database
GPG Key ID: 6ACF11630B5D8F82

@ -36,6 +36,7 @@ PEER_URL: https://www.radioid.net/static/rptrs.json
SUBSCRIBER_URL: https://www.radioid.net/static/users.json SUBSCRIBER_URL: https://www.radioid.net/static/users.json
TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
STALE_DAYS: 7 STALE_DAYS: 7
SUB_MAP_FILE:
[MYSQL] [MYSQL]
USE_MYSQL: False USE_MYSQL: False

@ -417,7 +417,8 @@ def SubMapTrimmer():
for _remove in _remove_list: for _remove in _remove_list:
SUB_MAP.pop(_remove) SUB_MAP.pop(_remove)
subMapWrite() if CONFIG['ALIASES']['SUB_MAP_FILE']:
subMapWrite()
@ -2610,7 +2611,8 @@ if __name__ == '__main__':
hblink_handler(_signal, _frame) hblink_handler(_signal, _frame)
logger.info('(GLOBAL) SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR') logger.info('(GLOBAL) SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
reactor.stop() reactor.stop()
subMapWrite() if CONFIG['ALIASES']['SUB_MAP_FILE']:
subMapWrite()
# Set signal handers so that we can gracefully exit if need be # Set signal handers so that we can gracefully exit if need be
for sig in [signal.SIGINT, signal.SIGTERM]: for sig in [signal.SIGINT, signal.SIGTERM]:
@ -2635,12 +2637,13 @@ if __name__ == '__main__':
#SUB_MAP = {bytes_3(73578):('REP-1',1,time())} #SUB_MAP = {bytes_3(73578):('REP-1',1,time())}
SUB_MAP = {} SUB_MAP = {}
try: if CONFIG['ALIASES']['SUB_MAP_FILE']:
with open(CONFIG['ALIASES']['SUB_MAP_FILE']) as _json_file: try:
SUB_MAP = json.load(_json_file) with open(CONFIG['ALIASES']['SUB_MAP_FILE']) as _json_file:
except: SUB_MAP = json.load(_json_file)
logger.warning('(SUBSCRIBER) Cannot load SUB_MAP file') except:
#sys.exit('(SUBSCRIBER) TERMINATING: SUB_MAP file not found or invalid') logger.warning('(SUBSCRIBER) Cannot load SUB_MAP file')
#sys.exit('(SUBSCRIBER) TERMINATING: SUB_MAP file not found or invalid')
#Generator #Generator

@ -85,6 +85,7 @@ PEER_URL: https://www.radioid.net/static/rptrs.json
SUBSCRIBER_URL: http://downloads.freedmr.uk/downloads/local_subscriber_ids.json SUBSCRIBER_URL: http://downloads.freedmr.uk/downloads/local_subscriber_ids.json
TGID_URL: TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json TGID_URL: TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
STALE_DAYS: 7 STALE_DAYS: 7
SUB_MAP_FILE:
[MYSQL] [MYSQL]
USE_MYSQL: False USE_MYSQL: False

Loading…
Cancel
Save

Powered by TurnKey Linux.