diff --git a/data_gateway.py b/data_gateway.py
index 9086701..b64b88f 100644
--- a/data_gateway.py
+++ b/data_gateway.py
@@ -184,11 +184,8 @@ def send_sms_log(CONFIG, snd_call, rcv_call, msg, rcv_id, snd_id, system_name):
try:
req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-## resp = json.loads(req.text)
-## print(resp)
-## return resp['rules']
- except requests.ConnectionError:
- logger.error('Config server unreachable')
+ except Exception as e:
+ logger.error(e)
def send_bb(CONFIG, callsign, dmr_id, bulletin, system_name):
user_man_url = CONFIG['WEB_SERVICE']['URL']
@@ -266,8 +263,8 @@ def send_sms_que_req(CONFIG):
resp = json.loads(req.text)
print(resp)
return resp['que']
- except requests.ConnectionError:
- logger.error('Config server unreachable')
+ except Exception as e:
+ logger.error(e)
def send_sms_cmd(CONFIG, _rf_id, _cmd):
print('ssnd rmt cmd')
@@ -1459,12 +1456,16 @@ def rule_timer_loop():
ping(CONFIG)
send_unit_table(CONFIG, UNIT_MAP)
send_que = send_sms_que_req(CONFIG)
- for i in send_que:
- try:
- send_sms(False, i['rcv_id'], 0000, 0000, 'unit', i['msg'])
- except Exception as e:
- logger.info('Error sending SMS in que to ' + str(i['rcv_id']) + ' - ' + i['msg'])
- logger.info(e)
+ try:
+ for i in send_que:
+ try:
+ send_sms(False, i['rcv_id'], 0000, 0000, 'unit', i['msg'])
+ except Exception as e:
+ logger.info('Error sending SMS in que to ' + str(i['rcv_id']) + ' - ' + i['msg'])
+ logger.info(e)
+ except Exception as e:
+ logger.error('Send que error')
+ logger.error(e)
diff --git a/web/app.py b/web/app.py
index ca84da9..f1e48a2 100644
--- a/web/app.py
+++ b/web/app.py
@@ -169,6 +169,9 @@ def hbnet_web_service():
city = db.Column(db.String(100), nullable=False, server_default='')
notes = db.Column(db.String(2000), nullable=False, server_default='')
aprs = db.Column(db.String(2000), nullable=False, server_default='{}')
+ api_keys = db.Column(db.String(2000), nullable=False, server_default='[]')
+ other = db.Column(db.String(2000), nullable=False, server_default='{}')
+
#Used for initial approval
initial_admin_approved = db.Column('initial_admin_approved', db.Boolean(), nullable=False, server_default='1')
# Define the relationship to Role via UserRoles
@@ -2393,12 +2396,6 @@ TG #: ''' + str(tg_d.tg) + '''
content = '''
APRS Settings
- '''
- for g in data_gateways:
- print(g.name)
-
- content = content + '''
-''' + g.name + '''
@@ -2416,49 +2413,49 @@ TG #: ''' + str(tg_d.tg) + '''
'''
- show_form = True
- for i in settings.items():
- content = content + '''
-
-
+
+\n
+'''
content = content + '
'
## for i in bbl:
@@ -3083,8 +3080,13 @@ Name: ''' + p.name + ''' - Port: ''' + str(
aprs_dict = {}
for i in ul:
usr_settings = ast.literal_eval(i.aprs)
- for s in usr_settings.items():
- aprs_dict[int(s[0])] = s[1]
+ for s in usr_settings.items():
+ print(s[1])
+ if s[1] == 'default':
+ aprs_dict[int(s[0])] = [{'call': str(i.username).upper()}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': ''}, {'APRS': False}]
+ else:
+ aprs_dict[int(s[0])] = s[1]
+ print(aprs_dict)
return aprs_dict
def add_burnlist(_dmr_id, _version):
diff --git a/web/config-SAMPLE.py b/web/config-SAMPLE.py
index e10c53b..1e1f8b7 100644
--- a/web/config-SAMPLE.py
+++ b/web/config-SAMPLE.py
@@ -27,6 +27,9 @@ secret_key = 'SUPER SECRET LONG KEY'
# Timezone to show time stamps in. Stored in DB as UTC. Offset in hours.
hbnet_tz = -1
+# Time format for display on some pages
+time_format = '%H:%M:%S - %m/%d/%y'
+
# Default state for newly created user accounts. Setting to False will require
# the approval of an admin user before the user can login.
default_account_state = True
@@ -89,6 +92,3 @@ USER_AUTO_LOGIN_AFTER_CONFIRM = False
USER_SHOW_USERNAME_DOES_NOT_EXIST = True
-# Time format for display on some pages
-time_format = '%H:%M:%S - %m/%d/%y'
-