diff --git a/server/MMVCServerSIO.py b/server/MMVCServerSIO.py index 99eaaf0b..4cf640f2 100755 --- a/server/MMVCServerSIO.py +++ b/server/MMVCServerSIO.py @@ -25,8 +25,16 @@ from const import ( ) import subprocess import multiprocessing as mp + from mods.log_control import VoiceChangaerLogger + +if __name__ == "__main__": + VoiceChangaerLogger.get_instance().initialize(initialize=True) +else: + VoiceChangaerLogger.get_instance().initialize(initialize=False) + + logger = VoiceChangaerLogger.get_instance().getLogger() logger.debug(f"---------------- Booting PHASE :{__name__} -----------------") diff --git a/server/mods/log_control.py b/server/mods/log_control.py index cf4c15a0..c8c9faf1 100644 --- a/server/mods/log_control.py +++ b/server/mods/log_control.py @@ -1,7 +1,5 @@ import logging -# logging.getLogger('numba').setLevel(logging.WARNING) - class UvicornSuppressFilter(logging.Filter): def filter(self, record): @@ -57,74 +55,24 @@ class VoiceChangaerLogger: logger = logging.getLogger("vcclient") logger.setLevel(logging.DEBUG) + self.logger = logger - if not logger.handlers: - # pass - # file_handler = logging.FileHandler('vvclient.log', encoding='utf-8', mode='w') - file_handler = logging.FileHandler('vvclient.log', encoding='utf-8') + def initialize(self, initialize: bool): + if not self.logger.handlers: + if initialize: + file_handler = logging.FileHandler('vvclient.log', encoding='utf-8', mode='w') + else: + file_handler = logging.FileHandler('vvclient.log', encoding='utf-8') file_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(process)d - %(message)s') file_handler.setFormatter(file_formatter) file_handler.setLevel(logging.DEBUG) - logger.addHandler(file_handler) + self.logger.addHandler(file_handler) stream_formatter = logging.Formatter('%(message)s') stream_handler = logging.StreamHandler() stream_handler.setFormatter(stream_formatter) stream_handler.setLevel(logging.INFO) - logger.addHandler(stream_handler) - - self.logger = logger + self.logger.addHandler(stream_handler) def getLogger(self): return self.logger - - -def setup_loggers(startMessage: str): - pass - - # # logger = logging.getLogger("uvicorn.error") - # # logger.addFilter(UvicornSuppressFilter()) - - # logger = logging.getLogger("fairseq.tasks.hubert_pretraining") - # logger.addFilter(UvicornSuppressFilter()) - - # logger = logging.getLogger("fairseq.models.hubert.hubert") - # logger.addFilter(UvicornSuppressFilter()) - - # logger = logging.getLogger("fairseq.tasks.text_to_speech") - # logger.addFilter(UvicornSuppressFilter()) - - # logger = logging.getLogger("numba.core.ssa") - # logger.addFilter(UvicornSuppressFilter()) - - # logger = logging.getLogger("numba.core.interpreter") - # logger.addFilter(UvicornSuppressFilter()) - - # logger = logging.getLogger("numba.core.byteflow") - # logger.addFilter(UvicornSuppressFilter()) - - # # logger.propagate = False - - # logger = logging.getLogger("multipart.multipart") - # logger.propagate = False - - # logging.getLogger("asyncio").setLevel(logging.WARNING) - - # logger = logging.getLogger("vcclient") - # logger.setLevel(logging.DEBUG) - - # if not logger.handlers: - # # file_handler = logging.FileHandler('vvclient.log', encoding='utf-8', mode='w') - # file_handler = logging.FileHandler('vvclient.log', encoding='utf-8') - # file_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(process)d - %(message)s') - # file_handler.setFormatter(file_formatter) - # file_handler.setLevel(logging.INFO) - # logger.addHandler(file_handler) - - # stream_formatter = logging.Formatter('%(message)s') - # stream_handler = logging.StreamHandler() - # stream_handler.setFormatter(stream_formatter) - # stream_handler.setLevel(logging.DEBUG) - # logger.addHandler(stream_handler) - - # logger.info(f"Start Logging, {startMessage}")