refactor(framework): Move logger init to SysomFramework.init

environment/1_sdk/sysom_utils/framework.py

@@ -11,6 +11,7 @@ from typing import Optional, Dict, Type
 from gcache_base import dispatch_g_cache, GCache
 from channel_job.job import default_channel_job_executor
 from gclient_base import dispatch_g_client, GClient
+from clogger import logger
 from .config_parser import ConfigParser
 from .framework_plug_mag import FrameworkPlugMag, FrameworkPluginBase
 
@@ -27,8 +28,16 @@ class SysomFramework:
     def init(cls, config: ConfigParser):
         cls._config = config
         cls._framework_plug_mag = FrameworkPlugMag(config)
+        cls.init_logger(config)
         return cls
     
+    @classmethod
+    def init_logger(cls, config: ConfigParser):
+        log_format = config.get_server_config().logger.format
+        log_level = config.get_server_config().logger.level
+        logger.set_format(log_format)
+        logger.set_level(log_level)
+        
     @classmethod
     def gcache(cls, cache_name: str) -> GCache:
         if cls._config is None:

sysom_server/sysom_api/conf/common.py

@@ -1,4 +1,3 @@
-from clogger import logger
 import os
 import datetime
 from pathlib import Path
@@ -152,12 +151,3 @@ SYSOM_CEC_API_HOST_TOPIC = \
 ##################################################################
 # channl_job SDK 需要的url
 SYSOM_HOST_CEC_URL = YAML_CONFIG.get_local_channel_job_url()
-
-
-##################################################################
-# Config settings
-##################################################################
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_channel/conf/common.py

@@ -6,7 +6,6 @@ Email               mfeng@linux.alibaba.com
 File                common.py
 Description:
 """
-from clogger import logger
 import os
 from pathlib import Path
 from sysom_utils import ConfigParser, CecTarget, SysomFramework
@@ -66,11 +65,3 @@ SYSOM_CEC_CHANNEL_TOPIC = cec_config.topics.SYSOM_CEC_CHANNEL_TOPIC
 SYSOM_CEC_CHANNEL_CONSUMER_GROUP = cec_config.consumer_group
 # 通道模块用于投递执行结果的主题
 SYSOM_CEC_CHANNEL_RESULT_TOPIC = cec_config.topics.SYSOM_CEC_CHANNEL_RESULT_TOPIC
-
-##################################################################
-# Logging config
-##################################################################
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_diagnosis/conf/common.py

@@ -1,4 +1,3 @@
-from clogger import logger
 import os
 from pathlib import Path
 from sysom_utils import ConfigParser, CecTarget, SysomFramework
@@ -115,12 +114,3 @@ REST_FRAMEWORK = {
     'UNICODE_JSON': True,
     'EXCEPTION_HANDLER': 'lib.exception.exception_handler'
 }
-
-##################################################################
-# Config settings
-##################################################################
-# Config log format
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_hotfix/conf/common.py

@@ -1,9 +1,7 @@
 import os
 import datetime
-import sys
 from pathlib import Path
-from sysom_utils import ConfigParser, CecTarget
-from clogger import logger
+from sysom_utils import ConfigParser, CecTarget, SysomFramework
 
 
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -16,6 +14,8 @@ YAML_SERVICE_CONFIG_PATH = f"{BASE_DIR}/config.yml"
 
 YAML_CONFIG = ConfigParser(YAML_GLOBAL_CONFIG_PATH, YAML_SERVICE_CONFIG_PATH)
 
+SysomFramework.init(YAML_CONFIG)
+
 ##########################################################################################
 # Django Config
 ##########################################################################################
@@ -122,12 +122,3 @@ SYSOM_CEC_URL = YAML_CONFIG.get_cec_url(CecTarget.PRODUCER)
 SYSOM_CEC_HOTFIX_TOPIC = "hotfix_job"
 # channl_job SDK 需要的url
 CHANNEL_JOB_URL = YAML_CONFIG.get_local_channel_job_url()
-
-##################################################################
-# Config settings
-##################################################################
-# Config log format
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_migration/conf/common.py

@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
 """
 from pathlib import Path
 from clogger import logger
-from sysom_utils import ConfigParser, CecTarget
+from sysom_utils import ConfigParser, CecTarget, SysomFramework
 
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -25,6 +25,7 @@ YAML_SERVICE_CONFIG_PATH = f"{BASE_DIR}/config.yml"
 
 YAML_CONFIG = ConfigParser(YAML_GLOBAL_CONFIG_PATH, YAML_SERVICE_CONFIG_PATH)
 
+SysomFramework.init(YAML_CONFIG)
 
 ##########################################################################################
 # Django Config
@@ -168,12 +169,3 @@ REST_FRAMEWORK = {
     'UNICODE_JSON': True,
     'EXCEPTION_HANDLER': 'lib.exception.exception_handler'
 }
-
-##################################################################
-# Config settings
-##################################################################
-# Config log format
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_monitor_server/conf/common.py

@@ -6,8 +6,6 @@ Email               mfeng@linux.alibaba.com
 File                common.py
 Description:
 """
-from clogger import logger
-import sys
 from pathlib import Path
 from sysom_utils import ConfigParser, SysomFramework
 
@@ -29,13 +27,3 @@ SysomFramework.init(YAML_CONFIG)
 ##################################################################
 # channl_job SDK 需要的url
 CHANNEL_JOB_URL = YAML_CONFIG.get_local_channel_job_url()
-
-
-##################################################################
-# Logger settings
-##################################################################
-# Config log format
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_vmcore/conf/common.py

@@ -9,11 +9,9 @@ https://docs.djangoproject.com/en/3.2/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
-from clogger import logger
-import sys
 import os
 from pathlib import Path
-from sysom_utils import ConfigParser
+from sysom_utils import ConfigParser, SysomFramework
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -26,6 +24,8 @@ YAML_SERVICE_CONFIG_PATH = f"{BASE_DIR}/config.yml"
 
 YAML_CONFIG = ConfigParser(YAML_GLOBAL_CONFIG_PATH, YAML_SERVICE_CONFIG_PATH)
 
+SysomFramework.init(YAML_CONFIG)
+
 ##################################################################
 # Cec settings
 ##################################################################
@@ -156,12 +156,3 @@ REST_FRAMEWORK = {
     'UNICODE_JSON': True,
     'EXCEPTION_HANDLER': 'lib.exception.exception_handler'
 }
-
-##################################################################
-# Config settings
-##################################################################
-# Config log format
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)

sysom_server/sysom_vul/conf/common.py

@@ -9,11 +9,9 @@ https://docs.djangoproject.com/en/3.2/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
-import sys
 import os
 from pathlib import Path
-from clogger import logger
-from sysom_utils.config_parser import ConfigParser, CecTarget
+from sysom_utils import ConfigParser, CecTarget, SysomFramework
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -25,6 +23,8 @@ YAML_GLOBAL_CONFIG_PATH = f"{BASE_DIR.parent.parent}/conf/config.yml"
 YAML_SERVICE_CONFIG_PATH = f"{BASE_DIR}/config.yml"
 YAML_CONFIG = ConfigParser(YAML_GLOBAL_CONFIG_PATH, YAML_SERVICE_CONFIG_PATH)
 
+SysomFramework.init(YAML_CONFIG)
+
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = YAML_CONFIG.get_server_config().jwt.get("SECRET_KEY", "")
 
@@ -108,7 +108,6 @@ USE_L10N = True
 USE_TZ = True
 
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.2/howto/static-files/
 
@@ -163,12 +162,3 @@ HOST_SERVICE_NAME = 'host'
 HOST_SERVICE_PORT = 7001
 SERVICE_URL = 'http://127.0.0.1'
 HOST_API_VERSION_ = '/api/v1/'
-
-##################################################################
-# Config settings
-##################################################################
-# Config log format
-log_format = YAML_CONFIG.get_server_config().logger.format
-log_level = YAML_CONFIG.get_server_config().logger.level
-logger.set_format(log_format)
-logger.set_level(log_level)