From e258baf5915b8938d0f9db3b684743618d2c4e31 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 21 Apr 2021 19:13:28 +0100 Subject: [PATCH] Handle keyerror when options calling reset tg --- bridge_master.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index b27c249..8c0b791 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -228,13 +228,17 @@ def make_static_tg(tg,ts,_tmout,system): def reset_static_tg(tg,ts,_tmout,system): #_tmout = CONFIG['SYSTEMS'][system]['DEFAULT_UA_TIMER'] bridgetemp = [] - for bridgesystem in BRIDGES[str(tg)]: - if bridgesystem['SYSTEM'] == system and bridgesystem['TS'] == ts: - bridgetemp.append({'SYSTEM': system, 'TS': ts, 'TGID': bytes_3(tg),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(tg),],'RESET': [], 'TIMER': time() + (_tmout * 60)}) - else: - bridgetemp.append(bridgesystem) - - BRIDGES[str(tg)] = bridgetemp + try: + for bridgesystem in BRIDGES[str(tg)]: + if bridgesystem['SYSTEM'] == system and bridgesystem['TS'] == ts: + bridgetemp.append({'SYSTEM': system, 'TS': ts, 'TGID': bytes_3(tg),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(tg),],'RESET': [], 'TIMER': time() + (_tmout * 60)}) + else: + bridgetemp.append(bridgesystem) + + BRIDGES[str(tg)] = bridgetemp + except KeyError: + logger.warning('(ERROR) KeyError in reset_static_tg() - bridge gone away?') + return def reset_default_reflector(reflector,_tmout,system): bridge = '#'+str(reflector)