From 1467e085fca714876d79ff739c8bb13ad3d74087 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 21 Apr 2022 01:44:43 +0100 Subject: [PATCH] Revert "sysignore should be a set not an array, for speed" This reverts commit 93018928c1db834aea142e8a62efd8e82ef3382a. --- bridge_master.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 8f97cb6..7a27664 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -1823,7 +1823,7 @@ class routerOBP(OPENBRIDGE): logger.debug('(%s) Bridge for STAT TG %s does not exist. Creating',self._system, int_id(_dst_id)) make_stat_bridge(_dst_id) - _sysIgnore = set() + _sysIgnore = [] for _bridge in BRIDGES: for _system in BRIDGES[_bridge]: @@ -2627,7 +2627,7 @@ class routerHBP(HBSYSTEM): #Save this packet self.STATUS[_slot]['lastData'] = _data - _sysIgnore = set() + _sysIgnore = [] for _bridge in BRIDGES: #if _bridge[0:1] != '#': if True: @@ -2887,11 +2887,9 @@ if __name__ == '__main__': # Build the routing rules file BRIDGES = make_bridges(rules_module.BRIDGES) - #Subscriber map for unit calls + #Subscriber map for unit calls - complete with test entry + #SUB_MAP = {bytes_3(73578):('REP-1',1,time())} SUB_MAP = {} - #Also store a reference to SUB_MAP in the config structure - #Among other things, this means it's available on the reporting port - CONFIG['_SUB_MAP'] = SUB_MAP if CONFIG['ALIASES']['SUB_MAP_FILE']: @@ -2900,7 +2898,12 @@ if __name__ == '__main__': SUB_MAP = pickle.load(_fh) except: logger.warning('(SUBSCRIBER) Cannot load SUB_MAP file') - + #sys.exit('(SUBSCRIBER) TERMINATING: SUB_MAP file not found or invalid') + + #Test value + #SUB_MAP[bytes_3(73578)] = ('REP-1',1,time()) + + #Generator generator = {} systemdelete = []