Preserve peers in config dict
This commit is contained in:
parent
057318ef44
commit
0aa3f57a08
@ -762,6 +762,10 @@ def mysql_config_check():
|
|||||||
if SQLCONFIG[system]['TG2_ACL'] != CONFIG['SYSTEMS'][system]['TG2_ACL']:
|
if SQLCONFIG[system]['TG2_ACL'] != CONFIG['SYSTEMS'][system]['TG2_ACL']:
|
||||||
logger.debug('(MYSQL) TG2 ACL changed')
|
logger.debug('(MYSQL) TG2 ACL changed')
|
||||||
|
|
||||||
|
#Preserve peers list
|
||||||
|
if system in CONFIG['SYSTEMS']:
|
||||||
|
SQLCONFIG[system]['PEERS'] = CONFIG['SYSTEMS'][system]['PEERS']
|
||||||
|
|
||||||
#Add MySQL config data to config dict
|
#Add MySQL config data to config dict
|
||||||
CONFIG['SYSTEMS'].update(SQLCONFIG)
|
CONFIG['SYSTEMS'].update(SQLCONFIG)
|
||||||
|
|
||||||
@ -1178,8 +1182,6 @@ class routerHBP(HBSYSTEM):
|
|||||||
#logger.debug('(%s) Packet routed by bridge: %s to system: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
|
#logger.debug('(%s) Packet routed by bridge: %s to system: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
|
def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
|
||||||
pkt_time = time()
|
pkt_time = time()
|
||||||
dmrpkt = _data[20:53]
|
dmrpkt = _data[20:53]
|
||||||
|
Loading…
Reference in New Issue
Block a user