Skip to content

Commit 3bd20fd

Browse files
committed
fixes
1 parent 7608451 commit 3bd20fd

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

dsg_lib/common_functions/logging_config.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def config_log(
9191
log_serializer=False,
9292
log_diagnose=True,
9393
app_name='my_app',
94-
append_app_name=True
94+
append_app_name=True,
9595
enqueue=True,
9696
intercept_standard_logging=True,
9797
file_sink=True
@@ -112,6 +112,7 @@ def config_log(
112112
log_format = '<green>{time:YYYY-MM-DD HH:mm:ss.SSSSSS}</green> | <level>{level: <8}</level> | <cyan> {name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>' # pragma: no cover
113113

114114
if log_serializer is True:
115+
log_format = '{message}' # pragma: no cover
115116
log_name = f'{log_name}.json' # pragma: no cover
116117
else:
117118
log_name = f'{log_name}.log' # pragma: no cover
@@ -153,6 +154,8 @@ def config_log(
153154
diagnose=log_diagnose,
154155
)
155156

157+
basic_config_handlers:list = []
158+
156159
class InterceptHandler(logging.Handler):
157160
"""
158161
Interceptor for standard logging.
@@ -198,14 +201,15 @@ def emit(self, record):
198201
level, record.getMessage()
199202
) # pragma: no cover
200203

201-
# Configure standard logging to use interceptor handler
202-
logging.basicConfig(handlers=[InterceptHandler()], level=logging_level.upper())
203204

204205
if intercept_standard_logging:
205206
# Add interceptor handler to all existing loggers
206207
for name in logging.root.manager.loggerDict:
207208
logging.getLogger(name).addHandler(InterceptHandler())
208209

210+
# Add interceptor handler to the root logger
211+
basic_config_handlers.append(InterceptHandler())
212+
209213
# Set the root logger's level to the lowest level possible
210214
logging.getLogger().setLevel(logging.NOTSET)
211215

@@ -242,8 +246,6 @@ def write(self, message):
242246
raise # Reraise if max retries exceeded
243247

244248

245-
basic_config_handlers:list = []
246-
247249
if file_sink:
248250
# Create an instance of ResilientFileSink
249251
resilient_sink = ResilientFileSink(str(log_path))

examples/log_example.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
logging_directory='log',
1717
log_name='log',
1818
logging_level='DEBUG',
19-
log_rotation='1 MB',
19+
log_rotation='100 MB',
2020
log_retention='10 days',
2121
log_backtrace=True,
22-
log_serializer=False,
22+
log_serializer=True,
2323
log_diagnose=True,
2424
# app_name='my_app',
2525
# append_app_name=True,
@@ -43,14 +43,14 @@ def div_zero_two(x, y):
4343

4444

4545

46-
def log_big_string(_):
47-
big_string = secrets.token_urlsafe(256)
48-
for _ in range(100):
46+
def log_big_string(lqty=100, size=256):
47+
big_string = secrets.token_urlsafe(size)
48+
for _ in range(lqty):
4949
logging.debug(f'Lets make this a big message {big_string}')
5050
div_zero(x=1, y=0)
5151
div_zero_two(x=1, y=0)
5252
# after configuring logging
53-
# user loguru to log messages
53+
# use loguru to log messages
5454
logger.debug('This is a debug message')
5555
logger.info('This is an info message')
5656
logger.error('This is an error message')
@@ -65,20 +65,19 @@ def log_big_string(_):
6565
logging.critical('This is a critical message')
6666

6767

68+
def worker(wqty=100, lqty=100, size=256):
69+
for _ in tqdm(range(wqty), ascii=True): # Adjusted for demonstration
70+
log_big_string(lqty=lqty, size=size)
6871

69-
def worker():
70-
for _ in tqdm(range(100), ascii=True): # Adjusted for demonstration
71-
log_big_string(None)
72-
73-
def main():
72+
def main(wqty=100, lqty=100, size=256, workers=2):
7473
threads = []
75-
for _ in range(4): # Create x threads
76-
t = threading.Thread(target=worker)
74+
for _ in range(workers): # Create workers threads
75+
t = threading.Thread(target=worker, args=(wqty, lqty, size,))
7776
threads.append(t)
7877
t.start()
7978

8079
for t in threads:
8180
t.join()
8281

8382
if __name__ == "__main__":
84-
main()
83+
main(wqty=100, lqty=10, size=256, workers=10)

0 commit comments

Comments
 (0)