Skip to content

Commit ed3e5ec

Browse files
refactor logging implementation to use integer levels for improved clarity and consistency
1 parent c87bd4c commit ed3e5ec

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

cads_worker/worker.py

+7-17
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
WORKER_LOG_LEVEL = os.getenv("WORKER_LOG_LEVEL", "false").upper()
2424
LEVELS_MAPPING = logging.getLevelNamesMapping()
2525
# 60 is above all the levels. it means no log
26-
WORKER_LOG_LEVEL_NAME = LEVELS_MAPPING.get(WORKER_LOG_LEVEL, 60)
26+
WORKER_LOG_LEVEL_INT = LEVELS_MAPPING.get(WORKER_LOG_LEVEL, 60)
2727

2828

2929
@functools.lru_cache
@@ -103,15 +103,9 @@ def add_stdout(
103103
) -> None:
104104
if job_id is None:
105105
job_id = self.job_id
106-
if log_type == "INFO":
107-
self.logger.info(message, job_id=job_id, **kwargs)
108-
if log_type == "DEBUG":
109-
self.logger.debug(message, job_id=job_id, **kwargs)
110-
if log_type == "WARN":
111-
self.logger.warn(message, job_id=job_id, **kwargs)
112-
if log_type == "WARNING":
113-
self.logger.warning(message, job_id=job_id, **kwargs)
114-
if LEVELS_MAPPING.get(log_type, 70) >= WORKER_LOG_LEVEL_NAME:
106+
log_level = LEVELS_MAPPING.get(log_type, 10)
107+
self.logger.log(log_level, message, job_id=job_id, **kwargs)
108+
if log_level >= WORKER_LOG_LEVEL_INT:
115109
cads_broker.database.add_event(
116110
event_type=log_type,
117111
request_uid=job_id,
@@ -130,13 +124,9 @@ def add_stderr(
130124
) -> None:
131125
if job_id is None:
132126
job_id = self.job_id
133-
if log_type == "EXCEPTION":
134-
log_type = "ERROR"
135-
if log_type == "ERROR":
136-
self.logger.error(message, job_id=job_id, **kwargs)
137-
if log_type == "CRITICAL":
138-
self.logger.critical(message, job_id=job_id, **kwargs)
139-
if LEVELS_MAPPING.get(log_type, 70) >= WORKER_LOG_LEVEL_NAME:
127+
log_level = LEVELS_MAPPING.get(log_type, 10)
128+
self.logger.log(log_level, message, job_id=job_id, **kwargs)
129+
if log_level >= WORKER_LOG_LEVEL_INT:
140130
cads_broker.database.add_event(
141131
event_type=log_type,
142132
request_uid=job_id,

0 commit comments

Comments
 (0)