ua1zbe
/
hbnet2
mirror of https://github.com/kf7eel/hbnet
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean data_gateway

This commit is contained in:
KF7EEL 2021-12-09 19:50:20 -08:00
parent 9336de3693
commit 665e6f510d
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
data_gateway.py
View File

@ -191,7 +191,6 @@ def send_sms_log(CONFIG, snd_call, rcv_call, msg, rcv_id, snd_id, system_name):
logger.error(e) logger.error(e)
def send_bb(CONFIG, callsign, dmr_id, bulletin, system_name): def send_bb(CONFIG, callsign, dmr_id, bulletin, system_name):
logger.info('sending')
user_man_url = CONFIG['WEB_SERVICE']['URL'] user_man_url = CONFIG['WEB_SERVICE']['URL']
shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest()) shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
sms_data = { sms_data = {
@ -238,25 +237,26 @@ def send_mb(CONFIG, _dst_callsign, _src_callsign, message, _dst_dmr_id, _src_dmr
def send_ss(CONFIG, callsign, message, dmr_id): def send_ss(CONFIG, callsign, message, dmr_id):
user_man_url = CONFIG['WEB_SERVICE']['URL'] if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest()) user_man_url = CONFIG['WEB_SERVICE']['URL']
sms_data = { shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
'ss_update': CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'], sms_data = {
'secret':shared_secret, 'ss_update': CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'],
'callsign': callsign, 'secret':shared_secret,
'message' : message, 'callsign': callsign,
'dmr_id' : dmr_id, 'message' : message,
'dmr_id' : dmr_id,
} }
json_object = json.dumps(sms_data, indent = 4) json_object = json.dumps(sms_data, indent = 4)
try: try:
req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'}) req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
## resp = json.loads(req.text) ## resp = json.loads(req.text)
## print(resp) ## print(resp)
## return resp['rules'] ## return resp['rules']
except requests.ConnectionError: except requests.ConnectionError:
logger.error('Config server unreachable') logger.error('Config server unreachable')
def send_unit_table(CONFIG, _data): def send_unit_table(CONFIG, _data):
user_man_url = CONFIG['WEB_SERVICE']['URL'] user_man_url = CONFIG['WEB_SERVICE']['URL']
@ -564,7 +564,6 @@ def dashboard_bb_write(call, dmr_id, time, bulletin, system_name):
if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True: if LOCAL_CONFIG['DATA_CONFIG']['USE_DASHBOARD'] == True:
if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True: if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True:
send_bb(CONFIG, call, dmr_id, bulletin, system_name) send_bb(CONFIG, call, dmr_id, bulletin, system_name)
logger.info('sending to dash')
else: else:
#try: #try:
dash_bb = ast.literal_eval(os.popen('cat ' + bb_file).read()) dash_bb = ast.literal_eval(os.popen('cat ' + bb_file).read())