ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More error debugging in mysql

Browse Source 
Handle changes to ACLs in DB
This commit is contained in:
Simon 2020-10-19 21:02:04 +01:00
parent a307898bea
commit 7bc15c6dd3
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bridge_master.py
View File

@ -704,9 +704,24 @@ def mysql_config_check():
continue continue
tg = int(tg) tg = int(tg)
make_static_tg(tg,2,_tmout,system) make_static_tg(tg,2,_tmout,system)
#Rebuild ACLs
SQLCONFIG[system]['REG_ACL'] = acl_build(SQLCONFIG[system]['REG_ACL'], PEER_MAX)
SQLCONFIG[system]['SUB_ACL'] = acl_build(SQLCONFIG[system]['SUB_ACL'], ID_MAX)
SQLCONFIG[system]['TG1_ACL'] = acl_build(SQLCONFIG[system]['TG1_ACL'], ID_MAX)
SQLCONFIG[system]['TG2_ACL'] = acl_build(SQLCONFIG[system]['TG2_ACL'], ID_MAX)
if SQLCONFIG[system]['REG_ACL'] != CONFIG['SYSTEMS'][system]['REG_ACL']:
logger.debug('(MYSQL) registration ACL changed')
if SQLCONFIG[system]['SUB_ACL'] != CONFIG['SYSTEMS'][system]['SUB_ACL']:
logger.debug('(MYSQL) subscriber ACL changed')
if SQLCONFIG[system]['TG1_ACL'] != CONFIG['SYSTEMS'][system]['TG1_ACL']:
logger.debug('(MYSQL) TG1 ACL changed')
if SQLCONFIG[system]['TG2_ACL'] != CONFIG['SYSTEMS'][system]['TG2_ACL']:
logger.debug('(MYSQL) TG2 ACL changed')
#Add MySQL config data to config dict #Add MySQL config data to config dict
CONFIG['SYSTEMS'].update(SQLCONFIG) CONFIG['SYSTEMS'].update(SQLCONFIG)
SQLCONFIG = {} SQLCONFIG = {}
sql.close() sql.close()

2
mysql_config.py
View File

@ -31,7 +31,7 @@ class useMYSQL:
logger.info('(MYSQL) DB Error') logger.info('(MYSQL) DB Error')
return (False) return (False)
else: else:
logger.info('(MYSQL) unspecified error') logger.info('(MYSQL) error: %s',err)
return(False) return(False)
return(True) return(True)