From 5c3526319fae12b968e060b9f4960c88e6d0fa80 Mon Sep 17 00:00:00 2001 From: Armor <2654988228@qq.com> Date: Wed, 10 Jul 2024 16:46:28 +0800 Subject: [PATCH] update --- src/My_Logger/project_logger.py | 15 ++++++++------- src/PostgresSQL/databaseHandler.py | 2 +- src/TG-tools/history_message_upload.py | 8 ++++++-- src/TG-tools/run_TG_message_manager.py | 13 ------------- 4 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 src/TG-tools/run_TG_message_manager.py diff --git a/src/My_Logger/project_logger.py b/src/My_Logger/project_logger.py index 34bd7db..33f463c 100644 --- a/src/My_Logger/project_logger.py +++ b/src/My_Logger/project_logger.py @@ -56,10 +56,11 @@ class LoggerClass: if __name__ == '__main__': - log = LoggerClass() - test_logger = log.get_log(logging.DEBUG) - test_logger.debug('debug') - test_logger.info('info') - test_logger.warning('warning') - test_logger.error('error') - test_logger.critical('critical') + # log = LoggerClass() + # test_logger = log.get_log(logging.DEBUG) + # test_logger.debug('debug') + # test_logger.info('info') + # test_logger.warning('warning') + # test_logger.error('error') + # test_logger.critical('critical') + pass diff --git a/src/PostgresSQL/databaseHandler.py b/src/PostgresSQL/databaseHandler.py index 7732a95..86fe6dd 100644 --- a/src/PostgresSQL/databaseHandler.py +++ b/src/PostgresSQL/databaseHandler.py @@ -5,7 +5,7 @@ from src.My_Logger.project_logger import LoggerClass class DatabaseHandler: def __init__(self, config, logger=None): - if not logger or not isinstance(logger, LoggerClass): + if not logger or not isinstance(logger, logging.RootLogger): log = LoggerClass() self.logger = log.get_log(logging.DEBUG) else: diff --git a/src/TG-tools/history_message_upload.py b/src/TG-tools/history_message_upload.py index e907421..3a18521 100644 --- a/src/TG-tools/history_message_upload.py +++ b/src/TG-tools/history_message_upload.py @@ -164,6 +164,9 @@ class MessageUploader: shutil.copy2(source_path, destination_path) return file_path.replace(file_name, new_file_name) + def logger_test(self): + self.logger.info('this is a test') + def upload_didi_saved_message_to_db(): msg_list = [] @@ -198,11 +201,12 @@ if __name__ == "__main__": config['database'] = "TestDB" tg = MessageUploader(config_path=config_path, local_logger=LoggerClass().get_log(logging.DEBUG), - local_load_path='E:\\SNSFiles\\ChatExport_2023-12-27', + local_load_path='E:\\SNSFiles\\ChatExport_2024-07-10', local_file_db_path=config['file_db_path'], size_limit=0.25) try: - tg.do_upload() + # tg.do_upload() + tg.logger_test() finally: tg.db_handler.close() print('done') diff --git a/src/TG-tools/run_TG_message_manager.py b/src/TG-tools/run_TG_message_manager.py deleted file mode 100644 index c5178de..0000000 --- a/src/TG-tools/run_TG_message_manager.py +++ /dev/null @@ -1,13 +0,0 @@ -import os -import time -import datetime -import json - - -from src.My_Logger.project_logger import LoggerClass -from src.PostgresSQL.databaseHandler import DatabaseHandler - -if __name__ == "__main__": - - print('done') -