Skip to content

Commit

Permalink
Merge pull request #1526 from pbiering/default-options
Browse files Browse the repository at this point in the history
adjust default options for debug log and broken item behavior
  • Loading branch information
pbiering authored Jun 18, 2024
2 parents 6b65800 + 55f181d commit e24702a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ Default: `2592000`

Skip broken item instead of triggering an exception

Default: False
Default: `True`

##### hook

Expand Down Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions config
Original file line number Diff line number Diff line change
Expand Up @@ -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\"")
Expand Down Expand Up @@ -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]
Expand Down
10 changes: 5 additions & 5 deletions radicale/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def json_str(value: Any) -> dict:
"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", {
Expand Down Expand Up @@ -273,19 +273,19 @@ def json_str(value: Any) -> dict:
"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", {
Expand Down

0 comments on commit e24702a

Please sign in to comment.