Skip to content

Fixes #339 not execute expensive len if log level matches #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2022
Merged

Fixes #339 not execute expensive len if log level matches #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RequestsLibrary/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def format_data_to_log_string(data, limit=LOG_CHAR_LIMIT):
if is_file_descriptor(data):
return repr(data)

if len(data) > limit and logging.getLogger().level > 10:
if logging.getLogger().level > logging.DEBUG and len(data) > limit:
data = "%s... (set the log level to DEBUG or TRACE to see the full content)" % data[:limit]

return data
3 changes: 3 additions & 0 deletions utests/test_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def test_format_data_not_truncate_debug_level(mocked_logger):
for i in range(0, 100001):
data = data + str(i)
mocked_logger.getLogger().level = 10
mocked_logger.DEBUG = 10
truncated = format_data_to_log_string(data)
assert truncated == data

Expand All @@ -137,6 +138,7 @@ def test_format_data_not_truncate_trace_level(mocked_logger):
for i in range(0, 100001):
data = data + str(i)
mocked_logger.getLogger().level = 0
mocked_logger.DEBUG = 10
truncated = format_data_to_log_string(data)
assert truncated == data

Expand All @@ -147,5 +149,6 @@ def test_format_data_truncate_info_level(mocked_logger):
for i in range(0, 100001):
data = data + str(i)
mocked_logger.getLogger().level = 20
mocked_logger.DEBUG = 10
truncated = format_data_to_log_string(data)
assert truncated == data[:10000] + '... (set the log level to DEBUG or TRACE to see the full content)'