From b754dd00953c582cb5ea75d688041560ee46293c Mon Sep 17 00:00:00 2001 From: David TARDIVEL Date: Mon, 23 Nov 2015 12:34:42 +0100 Subject: [PATCH] Update configuration file sample. Configuration file sample must be synchronized with source code updates, and especially with bug/1516701 fix. Change-Id: I8773539c88340a4cde0015c7a5c7c7204a47609b --- etc/watcher/watcher.conf.sample | 68 ++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/etc/watcher/watcher.conf.sample b/etc/watcher/watcher.conf.sample index 6f6cd5a03..ae433d1e6 100644 --- a/etc/watcher/watcher.conf.sample +++ b/etc/watcher/watcher.conf.sample @@ -4,7 +4,8 @@ # From watcher # -# Log output to standard error. (boolean value) +# Log output to standard error. This option is ignored if +# log_config_append is set. (boolean value) #use_stderr = true # Format string to use for log messages with context. (string value) @@ -19,17 +20,15 @@ # Prefix each line of exception output with this format. (string # value) -#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s +#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s -# List of logger=LEVEL pairs. (list value) -#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN +# List of logger=LEVEL pairs. This option is ignored if +# log_config_append is set. (list value) +#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN # Enables or disables publication of error events. (boolean value) #publish_errors = false -# Enables or disables fatal status of deprecations. (boolean value) -#fatal_deprecations = false - # The format for an instance that is passed with the log message. # (string value) #instance_format = "[instance: %(uuid)s] " @@ -38,52 +37,75 @@ # (string value) #instance_uuid_format = "[instance: %(uuid)s] " +# Format string for user_identity field of the +# logging_context_format_string (string value) +#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s + # Print debugging output (set logging level to DEBUG instead of -# default WARNING level). (boolean value) +# default INFO level). (boolean value) #debug = false -# Print more verbose output (set logging level to INFO instead of -# default WARNING level). (boolean value) -#verbose = false +# If set to false, will disable INFO logging level, making WARNING the +# default. (boolean value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#verbose = true # The name of a logging configuration file. This file is appended to # any existing logging configuration files. For details about logging # configuration files, see the Python logging module documentation. -# (string value) +# Note that when logging configuration files are used then all logging +# configuration is set in the configuration file and other logging +# configuration options are ignored (for example, log_format). (string +# value) # Deprecated group/name - [DEFAULT]/log_config #log_config_append = # DEPRECATED. A logging.Formatter log message format string which may # use any of the available logging.LogRecord attributes. This option # is deprecated. Please use logging_context_format_string and -# logging_default_format_string instead. (string value) +# logging_default_format_string instead. This option is ignored if +# log_config_append is set. (string value) #log_format = # Format string for %%(asctime)s in log records. Default: %(default)s -# . (string value) +# . This option is ignored if log_config_append is set. (string value) #log_date_format = %Y-%m-%d %H:%M:%S # (Optional) Name of log file to output to. If no default is set, -# logging will go to stdout. (string value) +# logging will go to stdout. This option is ignored if +# log_config_append is set. (string value) # Deprecated group/name - [DEFAULT]/logfile #log_file = # (Optional) The base directory used for relative --log-file paths. -# (string value) +# This option is ignored if log_config_append is set. (string value) # Deprecated group/name - [DEFAULT]/logdir #log_dir = -# Use syslog for logging. Existing syslog format is DEPRECATED during -# I, and will change in J to honor RFC5424. (boolean value) +# (Optional) Uses logging handler designed to watch file system. When +# log file is moved or removed this handler will open a new log file +# with specified path instantaneously. It makes sense only if log-file +# option is specified and Linux platform is used. This option is +# ignored if log_config_append is set. (boolean value) +#watch_log_file = false + +# Use syslog for logging. Existing syslog format is DEPRECATED and +# will be changed later to honor RFC5424. This option is ignored if +# log_config_append is set. (boolean value) #use_syslog = false # (Optional) Enables or disables syslog rfc5424 format for logging. If # enabled, prefixes the MSG part of the syslog message with APP-NAME -# (RFC5424). The format without the APP-NAME is deprecated in I, and -# will be removed in J. (boolean value) -#use_syslog_rfc_format = false +# (RFC5424). The format without the APP-NAME is deprecated in Kilo, +# and will be removed in Mitaka, along with this option. This option +# is ignored if log_config_append is set. (boolean value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +#use_syslog_rfc_format = true -# Syslog facility to receive log lines. (string value) +# Syslog facility to receive log lines. This option is ignored if +# log_config_append is set. (string value) #syslog_log_facility = LOG_USER @@ -483,7 +505,7 @@ # The name of a message executor, forexample: eventlet, blocking # (string value) -#executor = eventlet +#executor = blocking # The protocol used by the message broker, for example rabbit (string # value)