fix exception handling

main
Marshall Hallenbeck 2023-09-20 12:03:41 -04:00
parent 1e381fb62d
commit b788f09af8
1 changed files with 6 additions and 4 deletions

View File

@ -9,7 +9,7 @@ import sys
from http.server import BaseHTTPRequestHandler from http.server import BaseHTTPRequestHandler
from time import sleep from time import sleep
from nxc.helpers.logger import highlight from nxc.helpers.logger import highlight
from nxc.logger import NXCAdapter from nxc.logger import NXCAdapter, nxc_logger
class RequestHandler(BaseHTTPRequestHandler): class RequestHandler(BaseHTTPRequestHandler):
@ -91,13 +91,14 @@ class NXCHTTPServer(threading.Thread):
def run(self): def run(self):
try: try:
self.server.serve_forever() self.server.serve_forever()
except: except Exception as e:
nxc_logger.debug(f"Error starting HTTP server: {e}")
pass pass
def shutdown(self): def shutdown(self):
try: try:
while len(self.server.hosts) > 0: while len(self.server.hosts) > 0:
self.server.log.info(f"Waiting on {highlight(len(self.server.hosts))} host(s)") nxc_logger.info(f"Waiting on {highlight(len(self.server.hosts))} host(s)")
sleep(15) sleep(15)
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
@ -112,5 +113,6 @@ class NXCHTTPServer(threading.Thread):
if thread.is_alive(): if thread.is_alive():
try: try:
thread._stop() thread._stop()
except: except Exception as e:
nxc_logger.debug(f"Error stopping HTTP server: {e}")
pass pass