KB8PMY
/
ADN-DMR-Peer-Server
mirror of https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cs

Browse Source
AMI
Simon 4 years ago
parent 05233d5c02
commit cad7c57e2d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

10
bridge_master.py
Unescape View File

@ -2742,17 +2742,17 @@ if __name__ == '__main__':
#If MySQL is enabled, read master config from MySQL too #If MySQL is enabled, read master config from MySQL too
if CONFIG['MYSQL']['USE_MYSQL'] == True: if CONFIG['MYSQL']['USE_MYSQL'] == True:
logger.debug('(MYSQL) MySQL config enabled') logger.info('(MYSQL) MySQL config enabled')
SQLCONFIG = {} SQLCONFIG = {}
sql = useMYSQL(CONFIG['MYSQL']['SERVER'], CONFIG['MYSQL']['USER'], CONFIG['MYSQL']['PASS'], CONFIG['MYSQL']['DB'],CONFIG['MYSQL']['TABLE'],logger) sql = useMYSQL(CONFIG['MYSQL']['SERVER'], CONFIG['MYSQL']['USER'], CONFIG['MYSQL']['PASS'], CONFIG['MYSQL']['DB'],CONFIG['MYSQL']['TABLE'],logger)
#Run it once immediately #Run it once immediately
if sql.con(): if sql.con():
logger.debug('(MYSQL) reading config from database') logger.info('(MYSQL) reading config from database')
try: try:
SQLCONFIG = sql.getConfig() SQLCONFIG = sql.getConfig()
#Add MySQL config data to config dict #Add MySQL config data to config dict
except: except:
logger.debug('(MYSQL) problem with SQL query, aborting') logger.warning('(MYSQL) problem with SQL query, aborting')
sql.close() sql.close()
logger.debug('(MYSQL) building ACLs') logger.debug('(MYSQL) building ACLs')
# Build ACLs # Build ACLs
@ -2763,9 +2763,11 @@ if __name__ == '__main__':
CONFIG['SYSTEMS'].update(SQLCONFIG) CONFIG['SYSTEMS'].update(SQLCONFIG)
else: else:
logger.debug('(MYSQL) problem connecting to SQL server, aborting') logger.warning('(MYSQL) problem connecting to SQL server, aborting')
if CONFIG['ALLSTAR']['ENABLED']: if CONFIG['ALLSTAR']['ENABLED']:
logger.info('(AMI) Setting up AMI: Server: %s, Port: %s, User: %s, Pass: %s, Node: %s',CONFIG['ALLSTAR']['SERVER'],CONFIG['ALLSTAR']['PORT'],CONFIG['ALLSTAR']['USER'],CONFIG['ALLSTAR']['PASS'],CONFIG['ALLSTAR']['NODE'])
AMIOBJ = AMI(CONFIG['ALLSTAR']['SERVER'],CONFIG['ALLSTAR']['PORT'],CONFIG['ALLSTAR']['USER'],CONFIG['ALLSTAR']['PASS'],CONFIG['ALLSTAR']['NODE']) AMIOBJ = AMI(CONFIG['ALLSTAR']['SERVER'],CONFIG['ALLSTAR']['PORT'],CONFIG['ALLSTAR']['USER'],CONFIG['ALLSTAR']['PASS'],CONFIG['ALLSTAR']['NODE'])

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.