Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

reduced logging

Browse source
This commit is contained in:
DJ2LS 2024-04-18 15:01:16 +02:00
parent 3cb17fdb17
commit db408aeced
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
freedata_server/message_system_db_manager.py
View file

@ -13,7 +13,7 @@ class DatabaseManager:
def __init__(self, event_manger, db_file=None): def __init__(self, event_manger, db_file=None):
self.event_manager = event_manger self.event_manager = event_manger
if not db_file: if not db_file:
print(os.environ) #print(os.environ)
script_dir = os.path.dirname(os.path.abspath(__file__)) script_dir = os.path.dirname(os.path.abspath(__file__))
db_path = os.path.join(script_dir, 'freedata-messages.db') db_path = os.path.join(script_dir, 'freedata-messages.db')

24
freedata_server/server.py
View file

@ -331,18 +331,16 @@ def sock_states(sock):
@atexit.register @atexit.register
def stop_server(): def stop_server():
print("------------------------------------------") print("------------------------------------------")
try: # TODO This is causing problems for some reasons.
app.service_manager.modem_service.put("stop") #if "service_manager" :
if app.socket_interface_manager: # app.service_manager.modem_service.put("stop")
app.socket_interface_manager.stop_servers() # if app.socket_interface_manager:
# app.socket_interface_manager.stop_servers()
if app.service_manager.modem: # if app.service_manager.modem:
app.service_manager.modem.sd_input_stream.stop # app.service_manager.modem.sd_input_stream.stop
audio.sd._terminate() audio.sd._terminate()
except Exception as e: #time.sleep(1)
print(e)
print("Error stopping freedata_server")
time.sleep(1)
print('Server shutdown...') print('Server shutdown...')
print("------------------------------------------") print("------------------------------------------")
@ -360,6 +358,7 @@ def main():
app.modem_events = queue.Queue() # queue which holds latest events app.modem_events = queue.Queue() # queue which holds latest events
app.modem_fft = queue.Queue() # queue which holds latest fft data app.modem_fft = queue.Queue() # queue which holds latest fft data
app.modem_service = queue.Queue() # start / stop freedata_server service app.modem_service = queue.Queue() # start / stop freedata_server service
app.event_manager = event_manager.EventManager([app.modem_events]) # TODO remove the app.modem_event custom queue app.event_manager = event_manager.EventManager([app.modem_events]) # TODO remove the app.modem_event custom queue
# init state manager # init state manager
app.state_manager = state_manager.StateManager(app.state_queue) app.state_manager = state_manager.StateManager(app.state_queue)
@ -371,6 +370,7 @@ def main():
# start freedata_server service # start freedata_server service
app.modem_service.put("start") app.modem_service.put("start")
# initialize database default values # initialize database default values
DatabaseManager(app.event_manager).initialize_default_values() DatabaseManager(app.event_manager).initialize_default_values()
wsm.startThreads(app) wsm.startThreads(app)
@ -386,4 +386,4 @@ def main():
app.run(modemaddress, modemport) app.run(modemaddress, modemport)
if __name__ == "__main__": if __name__ == "__main__":
main() main()