diff --git a/bridge_master.py b/bridge_master.py index 40081c8..7a9db59 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -183,7 +183,6 @@ def make_single_reflector(_tgid,_sourcesystem): BRIDGES[_bridge].append({'SYSTEM': _system, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [_tgid,],'RESET': [], 'TIMER': time()}) if _system == 'OBP-BM': BRIDGES[_bridge].append({'SYSTEM': _system, 'TS': 1, 'TGID': _tgid,'ACTIVE': True,'TIMEOUT': '','TO_TYPE': 'NONE','OFF': [],'ON': [],'RESET': [], 'TIMER': time()}) - # Run this every minute for rule timer updates def rule_timer_loop(): diff --git a/config.py b/config.py index 04ac975..46ffacd 100755 --- a/config.py +++ b/config.py @@ -277,7 +277,7 @@ def build_config(_config_file): 'VOICE_IDENT': config.getboolean(section, 'VOICE_IDENT'), 'TS1_STATIC': config.get(section,'TS1_STATIC'), 'TS2_STATIC': config.get(section,'TS2_STATIC'), - 'DEFAULT_REFLECTOR': + 'DEFAULT_REFLECTOR': config.get(section, 'DEFAULT_REFLECTOR'), }}) CONFIG['SYSTEMS'][section].update({'PEERS': {}})