Skip to content

Commit e2c5686

Browse files
authored
Merge pull request #4790 from barnabasdomozi/remove_logger_conf
Remove logger.conf
2 parents 0912091 + 0c3e3d5 commit e2c5686

File tree

2 files changed

+49
-89
lines changed

2 files changed

+49
-89
lines changed

codechecker_common/logger.py

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,51 +48,71 @@ def debug_analyzer(self, msg, *args, **kwargs):
4848

4949
logging.setLoggerClass(CCLogger)
5050

51-
data_files_dir_path = os.environ.get('CC_DATA_FILES_DIR', '')
52-
DEFAULT_LOG_CFG_FILE = os.path.join(data_files_dir_path, 'config',
53-
'logger.conf')
5451

55-
56-
# Default config which can be used if reading log config from a
57-
# file fails.
58-
DEFAULT_LOG_CONFIG = '''{
52+
# Logger configuration
53+
LOG_CONFIG = '''
54+
{
5955
"version": 1,
60-
"disable_existing_loggers": false,
56+
"disable_existing_loggers": true,
6157
"formatters": {
6258
"brief": {
63-
"format": "[%(asctime)s][%(levelname)s] - %(message)s",
59+
"format": "[%(levelname)s %(asctime)s] - %(message)s",
6460
"datefmt": "%Y-%m-%d %H:%M"
6561
},
6662
"precise": {
6763
"format": "[%(levelname)s] [%(asctime)s] {%(name)s} [%(process)d] \
6864
<%(thread)d> - %(filename)s:%(lineno)d %(funcName)s() - %(message)s",
69-
"datefmt": "%Y-%m-%d %H:%M"
65+
"datefmt": "%Y-%m-%d %H:%M:%S"
7066
}
7167
},
72-
"handlers": {
73-
"default": {
68+
"loggers": {
69+
"analyzer": {
7470
"level": "INFO",
75-
"formatter": "brief",
76-
"class": "logging.StreamHandler"
71+
"handlers": ["console"]
72+
},
73+
"analyzer.clangsa": {
74+
"level": "INFO",
75+
"handlers": ["console"]
76+
},
77+
"analyzer.tidy": {
78+
"level": "INFO",
79+
"handlers": ["console"]
80+
},
81+
"buildlogger": {
82+
"level": "INFO",
83+
"handlers": ["console"]
84+
},
85+
"profiler": {
86+
"level": "INFO",
87+
"handlers": ["console"]
88+
},
89+
"report": {
90+
"level": "INFO",
91+
"handlers": ["console"]
92+
},
93+
"server": {
94+
"level": "INFO",
95+
"handlers": ["console"]
96+
},
97+
"system": {
98+
"level": "INFO",
99+
"handlers": ["console"]
100+
},
101+
"report-converter": {
102+
"level": "INFO",
103+
"handlers": ["console"]
77104
}
78105
},
79-
"loggers": {
80-
"": {
81-
"handlers": ["default"],
106+
"handlers": {
107+
"console": {
108+
"class": "logging.StreamHandler",
82109
"level": "INFO",
83-
"propagate": true
110+
"formatter": "brief",
111+
"stream": "ext://sys.stdout"
84112
}
85113
}
86-
}'''
87-
88-
89-
try:
90-
with open(DEFAULT_LOG_CFG_FILE, 'r',
91-
encoding="utf-8", errors="ignore") as dlc:
92-
DEFAULT_LOG_CONFIG = dlc.read()
93-
except IOError as ex:
94-
print(ex)
95-
print("Failed to load logger configuration. Using built-in config.")
114+
}
115+
'''
96116

97117

98118
def add_verbose_arguments(parser):
@@ -192,7 +212,7 @@ def setup_logger(log_level=None, stream=None):
192212
be given (stderr -> ext://sys.stderr, 'stdout' -> ext://sys.stdout).
193213
"""
194214

195-
log_config = json.loads(DEFAULT_LOG_CONFIG)
215+
log_config = json.loads(LOG_CONFIG)
196216
if log_level:
197217
log_level = validate_loglvl(log_level)
198218

config/logger.conf

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)