Skip to content

Change fixup log lvl to warning and merge diff log messages into related parent log #438

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
tobixen merged 3 commits into from
Oct 7, 2024
Merged

Change fixup log lvl to warning and merge diff log messages into related parent log #438

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07ea2db
Merge fixup log messages into one
MrEbbinghaus Oct 6, 2024
0a100a6
Change log level of fixup warning from `error` to `warning`
MrEbbinghaus Oct 6, 2024
ef16ef0
Fix name of rate limit test
MrEbbinghaus Oct 7, 2024
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
35 changes: 16 additions & 19 deletions caldav/lib/vcal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,32 +89,29 @@ def fix(event):
if fixed2 != event:
global fixup_error_loggings
fixup_error_loggings += 1
remove_bit = lambda n: n & (n - 1)
if not remove_bit(fixup_error_loggings):
log = logging.error
is_power_of_two = lambda n: not (n & (n - 1))
if is_power_of_two(fixup_error_loggings):
log = logging.warning
else:
log = logging.debug
log(
"""Ical data was modified to avoid compatibility issues
(Your calendar server breaks the icalendar standard)
This is probably harmless, particularly if not editing events or tasks
(error count: %i - this error is ratelimited)"""
% fixup_error_loggings,
exc_info=True,
)

log_message = [
"Ical data was modified to avoid compatibility issues",
"(Your calendar server breaks the icalendar standard)",
"This is probably harmless, particularly if not editing events or tasks",
f"(error count: {fixup_error_loggings} - this error is ratelimited)",
]

try:
import difflib

log(
"\n".join(
difflib.unified_diff(
event.split("\n"), fixed2.split("\n"), lineterm=""
)
)
diff = list(
difflib.unified_diff(event.split("\n"), fixed2.split("\n"), lineterm="")
)
except:
log("Original: \n" + event)
log("Modified: \n" + fixed2)
diff = ["Original: ", event, "Modified: ", fixed2]

log("\n".join(log_message + diff))

return fixed2

Expand Down