Просмотр исходного кода

Merge pull request #1526 from pbiering/default-options

adjust default options for debug log and broken item behavior
Peter Bieringer 1 год назад
Родитель
Сommit
e24702a65b
4 измененных файлов с 18 добавлено и 18 удалено
  1. 2 2
      CHANGELOG.md
  2. 6 6
      DOCUMENTATION.md
  3. 5 5
      config
  4. 5 5
      radicale/config.py

+ 2 - 2
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

+ 6 - 6
DOCUMENTATION.md

@@ -869,7 +869,7 @@ Default: `2592000`
 
 Skip broken item instead of triggering an exception
 
-Default: False
+Default: `True`
 
 ##### hook
 
@@ -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
 

+ 5 - 5
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\"")
@@ -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]

+ 5 - 5
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", {
@@ -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", {