From bbe70885619957e76a96a1667f57868dc73b4115 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 18 Jun 2024 17:42:49 +0200 Subject: [PATCH 1/3] change default of "skip_broken_item" to more user-friendly experience --- DOCUMENTATION.md | 2 +- config | 2 +- radicale/config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index ac3c03c9..a80d536c 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -869,7 +869,7 @@ Default: `2592000` Skip broken item instead of triggering an exception -Default: False +Default: `True` ##### hook diff --git a/config b/config index e42b96cc..c7939433 100644 --- a/config +++ b/config @@ -100,7 +100,7 @@ #max_sync_token_age = 2592000 # Skip broken item instead of triggering an exception -#skip_broken_item = False +#skip_broken_item = True # Command that is run after changes to storage # Example: ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by \"%(user)s\"") diff --git a/radicale/config.py b/radicale/config.py index afbe15ef..df3ec39a 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -224,7 +224,7 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([ "help": "delete sync token that are older", "type": positive_int}), ("skip_broken_item", { - "value": "False", + "value": "True", "help": "skip broken item instead of triggering exception", "type": bool}), ("hook", { From 51a7136b933be839717dddb3f6e0802a55974a0f Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 18 Jun 2024 17:43:35 +0200 Subject: [PATCH 2/3] disable extra content by default on debug log level --- DOCUMENTATION.md | 10 +++++----- config | 8 ++++---- radicale/config.py | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index a80d536c..4cc6def9 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -934,31 +934,31 @@ Default: `True` Log bad PUT request content (for further diagnostics) -Default: `False' +Default: `False` ##### backtrace_on_debug Log backtrace on level=debug -Default: `True' +Default: `False` ##### request_header_on_debug Log request on level=debug -Default: `True' +Default: `False` ##### request_content_on_debug Log request on level=debug -Default: `True' +Default: `False` ##### response_content_on_debug = True Log response on level=debug -Default: `True' +Default: `False` #### headers diff --git a/config b/config index c7939433..114820ad 100644 --- a/config +++ b/config @@ -145,16 +145,16 @@ #bad_put_request_content = False # Log backtrace on level=debug -#backtrace_on_debug = True +#backtrace_on_debug = False # Log request header on level=debug -#request_header_on_debug = True +#request_header_on_debug = False # Log request content on level=debug -#request_content_on_debug = True +#request_content_on_debug = False # Log response content on level=debug -#response_content_on_debug = True +#response_content_on_debug = False [headers] diff --git a/radicale/config.py b/radicale/config.py index df3ec39a..967580cb 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -273,19 +273,19 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([ "help": "log bad PUT request content", "type": bool}), ("backtrace_on_debug", { - "value": "True", + "value": "False", "help": "log backtrace on level=debug", "type": bool}), ("request_header_on_debug", { - "value": "True", + "value": "False", "help": "log request header on level=debug", "type": bool}), ("request_content_on_debug", { - "value": "True", + "value": "False", "help": "log request content on level=debug", "type": bool}), ("response_content_on_debug", { - "value": "True", + "value": "False", "help": "log response content on level=debug", "type": bool}), ("mask_passwords", { From 55f181da65dc6f7ef67ea480dac7427b6ccd0067 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 18 Jun 2024 17:45:38 +0200 Subject: [PATCH 3/3] update related to new default behavior --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1c5d24..48ef8271 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ * Enhancement: add support for auth.type=denyall (will be default for security reasons in upcoming releases) * Enhancement: display warning in case only default config is active * Enhancement: display warning in case no user authentication is active -* Enhancement: add option to skip broken item to avoid triggering exception +* Enhancement: add option to skip broken item to avoid triggering exception (default: enabled) * Enhancement: add support for predefined collections for new users -* Enhancement: add options to disable several parts in debug log like backtrace, request_header, request_content, response_content +* Enhancement: add options to enable several parts in debug log like backtrace, request_header, request_content, response_content (default: disabled) * Enhancement: rights/from_file: display resulting permission of a match in debug log ## 3.2.1