improve APRS thread kill

This commit is contained in:
KF7EEL 2021-04-24 06:58:18 -07:00
parent c5ea8f625b
commit a1fa625df5
3 changed files with 7 additions and 6 deletions

View File

@ -16,9 +16,9 @@
# Mode for application, operates differently than msg_xfer
'mode':'app',
# Name of external application
'app_name':'Bulletin Board',
'app_name':'Multi Network Bulletin Board',
# Endpoint URL of API
'url':'http://localhost:8080/post',
'url':'http://hbl.ink/bb/post',
# Website for users to get info
'website':'http://hbl.ink',
},

View File

@ -63,7 +63,7 @@ TGID_TS2_ACL: PERMIT:ALL
[REPORTS]
REPORT: True
REPORT_INTERVAL: 60
REPORT_PORT: 4323
REPORT_PORT: 4321
REPORT_CLIENTS: 127.0.0.1
@ -177,7 +177,6 @@ USER_SETTINGS_FILE: /path/to/user_settings.txt
# My API Name - Short abbreviation, must match other users access files.
# Server name - can be different than dashboard title, used to identify this network/server
USE_API: True
AUTHORIZED_APPS_FILE: /path/to/authorized_apps.py
AUTHORIZED_TOKENS_FILE: /tmp/hblink_auth_tokens.txt
AUTHORIZED_USERS_FILE: /path/to/authorized_users.txt
ACCESS_SYSTEMS_FILE: /path/to/access_systems.txt

View File

@ -874,7 +874,7 @@ def aprs_process(packet):
def aprs_rx(aprs_rx_login, aprs_passcode, aprs_server, aprs_port, aprs_filter, user_ssid):
global AIS
AIS = aprslib.IS(aprs_rx_login, passwd=int(aprs_passcode), host=aprs_server, port=int(aprs_port))
user_settings = ast.literal_eval(os.popen('cat ' + './user_settings.txt').read())
user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
AIS.set_filter(aprs_filter)#parser.get('GPS_DATA', 'APRS_FILTER'))
try:
if 'N0CALL' in aprs_callsign:
@ -2388,7 +2388,9 @@ if __name__ == '__main__':
logger.info('APRS callsighn set to N0CALL, packet not sent.')
pass
else:
threading.Thread(target=aprs_rx, args=(aprs_callsign, aprs_passcode, aprs_server, aprs_port, aprs_filter, user_ssid,)).start()
aprs_thread = threading.Thread(target=aprs_rx, args=(aprs_callsign, aprs_passcode, aprs_server, aprs_port, aprs_filter, user_ssid,))
aprs_thread.daemon = True
aprs_thread.start()
#logger.info(UNIT_MAP)
#global authorized_users, other_systems
#from .scripts.dashboard.authorized_apps import authorized_users, other_systems