Skip to content

Commit ef1b4f4

Browse files
authored
Merge pull request #1937 from oliv3r/logger_fix
Fixed: Logger shutdown safety during Python cleanup
2 parents 14eca40 + 6ecc2fd commit ef1b4f4

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

resources/lib/logger.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ def trace(msg, *args, **kwargs):
136136
"""
137137

138138
# noinspection PyArgumentList
139+
if Logger.__logger is None:
140+
return
139141
Logger.__logger.__write(msg, level=Logger.LVL_TRACE, *args, **kwargs)
140142
return
141143

@@ -153,6 +155,8 @@ def debug(msg, *args, **kwargs):
153155
"""
154156

155157
# noinspection PyArgumentList
158+
if Logger.__logger is None:
159+
return
156160
Logger.__logger.__write(msg, level=Logger.LVL_DEBUG, *args, **kwargs)
157161
return
158162

@@ -170,6 +174,8 @@ def info(msg, *args, **kwargs):
170174
"""
171175

172176
# noinspection PyArgumentList
177+
if Logger.__logger is None:
178+
return
173179
Logger.__logger.__write(msg, level=Logger.LVL_INFO, *args, **kwargs)
174180
return
175181

@@ -187,6 +193,8 @@ def error(msg, *args, **kwargs):
187193
"""
188194

189195
# noinspection PyArgumentList
196+
if Logger.__logger is None:
197+
return
190198
Logger.__logger.__write(msg, level=Logger.LVL_ERROR, *args, **kwargs)
191199
return
192200

@@ -204,6 +212,8 @@ def warning(msg, *args, **kwargs):
204212
"""
205213

206214
# noinspection PyArgumentList
215+
if Logger.__logger is None:
216+
return
207217
Logger.__logger.__write(msg, level=Logger.LVL_WARNING, *args, **kwargs)
208218
return
209219

@@ -221,6 +231,8 @@ def critical(msg, *args, **kwargs):
221231
"""
222232

223233
# noinspection PyArgumentList
234+
if Logger.__logger is None:
235+
return
224236
Logger.__logger.__write(msg, level=Logger.LVL_CRITICAL, *args, **kwargs)
225237
return
226238

0 commit comments

Comments
 (0)