diff --git a/app/classes/shared/console.py b/app/classes/shared/console.py index 942e0301..96b1e324 100644 --- a/app/classes/shared/console.py +++ b/app/classes/shared/console.py @@ -2,17 +2,17 @@ import datetime import logging import sys -from app.classes.shared.helpers import helper +logger = logging.getLogger(__name__) try: from colorama import init from termcolor import colored -except ModuleNotFoundError as e: - helper.auto_installer_fix(e) - -logger = logging.getLogger(__name__) - +except ModuleNotFoundError as ex: + logger.critical(f"Import Error: Unable to load {ex.name} module", exc_info=True) + print(f"Import Error: Unable to load {ex.name} module") + from app.classes.shared.installer import installer + installer.do_install() class Console: def __init__(self): diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 111b22f8..1d9756c2 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -22,9 +22,10 @@ import psutil from app.classes.shared.console import console from app.classes.shared.installer import installer from app.classes.shared.file_helpers import file_helper -from app.classes.shared.helpers import helper from app.classes.web.websocket_helper import websocket_helper +logger = logging.getLogger(__name__) + try: import requests from requests import get @@ -32,9 +33,9 @@ try: from argon2 import PasswordHasher except ModuleNotFoundError as err: - helper.auto_installer_fix(err) - -logger = logging.getLogger(__name__) + logger.critical(f"Import Error: Unable to load {err.name} module", exc_info=True) + print(f"Import Error: Unable to load {err.name} module") + installer.do_install() class Helpers: allowed_quotes = [ diff --git a/main.py b/main.py index f3f1078c..e11cc8b8 100644 --- a/main.py +++ b/main.py @@ -151,8 +151,8 @@ if __name__ == '__main__': def sigterm_handler(*sig): print() # for newline - logger.info(f"Recieved SIGINT [{sig[0]}], stopping Crafty...") - console.info(f"Recieved SIGINT [{sig[0]}], stopping Crafty...") + logger.info(f"Recieved {signal.Signals(sig[0]).name} [{sig[0]}], stopping Crafty...") + console.info(f"Recieved {signal.Signals(sig[0]).name} [{sig[0]}], stopping Crafty...") tasks_manager._main_graceful_exit() Crafty.universal_exit()