diff --git a/FreeDMR-SAMPLE.cfg b/FreeDMR-SAMPLE.cfg index 73a2054..add79e1 100755 --- a/FreeDMR-SAMPLE.cfg +++ b/FreeDMR-SAMPLE.cfg @@ -46,6 +46,9 @@ SUB_ACL: DENY:1 TGID_TS1_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL GEN_STAT_BRIDGES: False +ALLOW_NULL_PASSPHRASE: False +ANNOUNCEMENT_LANGUAGE: en_GB + # NOT YET WORKING: NETWORK REPORTING CONFIGURATION diff --git a/bridge_master.py b/bridge_master.py index 4d19295..7375cee 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -42,11 +42,6 @@ import re from twisted.internet.protocol import Factory, Protocol from twisted.protocols.basic import NetstringReceiver from twisted.internet import reactor, task -#We're going to *try* and be thread safe -#from twisted.python import threadable -#threadable.init(1) - -from threading import Semaphore # Things we import from the main hblink module from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases @@ -666,6 +661,7 @@ def mysqlGetConfig(): logger.debug('(MYSQL) problem connecting to SQL server, aborting') return + sql.close() reactor.callFromThread(mysql_config_check,SQLGETCONFIG) @@ -926,7 +922,6 @@ def mysql_config_check(SQLGETCONFIG): #CONFIG['SYSTEMS'].update(SQLCONFIG) SQLCONFIG = {} - sql.close() class routerOBP(OPENBRIDGE): diff --git a/config.py b/config.py index e6a7825..0004795 100755 --- a/config.py +++ b/config.py @@ -123,7 +123,8 @@ def build_config(_config_file): 'TG1_ACL': config.get(section, 'TGID_TS1_ACL'), 'TG2_ACL': config.get(section, 'TGID_TS2_ACL'), 'GEN_STAT_BRIDGES': config.getboolean(section, 'GEN_STAT_BRIDGES'), - 'ALLOW_NULL_PASSPHRASE': config.getboolean(section, 'ALLOW_NULL_PASSPHRASE') + 'ALLOW_NULL_PASSPHRASE': config.getboolean(section, 'ALLOW_NULL_PASSPHRASE'), + 'ANNOUNCEMENT_LANGUAGE': config.get(section, 'ANNOUNCEMENT_LANGUAGE') })