Merge "use underscores in log options, log options table"

This commit is contained in:
Jenkins
2012-08-27 14:38:20 +00:00
committed by Gerrit Code Review
3 changed files with 62 additions and 7 deletions

View File

@@ -124,7 +124,7 @@
http://docs.python.org/library/logging.html#formatter </para>
<para>You have two options for logging for OpenStack Compute based on configuration
settings. In nova.conf, include the logfile option to enable logging. Alternatively
you can set use_syslog=1, and then the nova daemon logs to syslog.</para></section>
you can set use_syslog=true, and then the nova daemon logs to syslog.</para></section>
<section xml:id="common-errors-and-fixes-for-openstack-compute">
<title>Common Errors and Fixes for OpenStack Compute</title>
<para>The Launchpad Answers site offers a place to ask and answer questions, and you can also mark questions as frequently asked questions. This section describes some errors people have posted to Launchpad Answers and IRC. We are constantly fixing bugs, so online resources are a great way to get the most up-to-date errors and fixes.</para>

View File

@@ -274,7 +274,7 @@
<td><para> (StrOpt) Directory to use for lock files </para></td>
</tr>
<tr>
<td><para>log-config=&lt;None&gt; </para></td>
<td><para>log_config=&lt;None&gt; </para></td>
<td><para> (StrOpt) If this option is specified, the logging
configuration file specified is used and overrides
any other logging options specified. Please see
@@ -282,23 +282,22 @@
details on logging configuration files. </para></td>
</tr>
<tr>
<td><para> log-date-format=%Y-%m-%d %H:%M:%S </para></td>
<td><para> log_date_format=%Y-%m-%d %H:%M:%S </para></td>
<td><para> (StrOpt) Format string for %(asctime)s in log
records. Default: %default </para></td>
</tr>
<tr>
<td><para>log-dir=&lt;None&gt; </para></td>
<td><para>log_dir=&lt;None&gt; </para></td>
<td><para> (StrOpt) (Optional) The directory to keep log
files in (will be prepended to --logfile) </para></td>
</tr>
<tr>
<td><para>log-file=&lt;None&gt; </para></td>
<td><para>log_file=&lt;None&gt; </para></td>
<td><para> (StrOpt) (Optional) Name of log file to output
to. If not set, logging will go to stdout. </para></td>
</tr>
<tr>
<td><para> log-format= "%(asctime)s %(levelname)8s [%(name)s]
%(message)s" </para></td>
<td><para> log_format= "%(asctime)s %(levelname)8s [%(name)s] %(message)s" </para></td>
<td><para> (StrOpt) A logging.Formatter log message format
string which may use any of the available
logging.LogRecord attributes. Default: %default

View File

@@ -27,6 +27,50 @@
<td> (StrOpt) If an instance UUID is passed with the
log message, format it like this </td>
</tr>
<tr>
<td><para>log_config=&lt;None&gt; </para></td>
<td><para> (StrOpt) If this option is specified, the logging
configuration file specified is used and overrides
any other logging options specified. Please see
the Python logging module documentation for
details on logging configuration files. </para></td>
</tr>
<tr>
<td><para> log_date_format=%Y-%m-%d %H:%M:%S </para></td>
<td><para> (StrOpt) Format string for %(asctime)s in log
records. Default: %default </para></td>
</tr>
<tr>
<td><para>log_dir=&lt;None&gt; </para></td>
<td><para> (StrOpt) (Optional) The directory to keep log
files in (will be prepended to --logfile) </para></td>
</tr>
<tr>
<td><para>log_file=&lt;None&gt; </para></td>
<td><para> (StrOpt) (Optional) Name of log file to output
to. If not set, logging will go to stdout. </para></td>
</tr>
<tr>
<td><para> log_format="%(asctime)s %(levelname)8s [%(name)s] %(message)s" </para></td>
<td><para> (StrOpt) A logging.Formatter log message format
string which may use any of the available
logging.LogRecord attributes. Default: %default
</para></td>
</tr>
<tr>
<td><para>logdir=&lt;None&gt; </para></td>
<td><para> (StrOpt) Log output to a per-service log file in
named directory </para></td>
</tr>
<tr>
<td><para>logfile=&lt;None&gt; </para></td>
<td><para> (StrOpt) Log output to a named file </para></td>
</tr>
<tr>
<td><para> logfile_mode=0644 </para></td>
<td><para> (StrOpt) Default file mode used when creating log
files </para></td>
</tr>
<tr>
<td> logging_context_format_string="%(asctime)s
%(levelname)s %(name)s [%(request_id)s %(user_id)s
@@ -58,6 +102,18 @@
<td> publish_errors=false </td>
<td> (BoolOpt) publish error events </td>
</tr>
<tr>
<td> publish_errors=false </td>
<td> (BoolOpt) publish error events </td>
</tr>
<tr>
<td>use_syslog=false</td>
<td>(BoolOpt) Use syslog for logging</td>
</tr>
<tr>
<td>syslog_log_facility=LOG_USER</td>
<td> (StrOpt) syslog facility to receive log lines</td>
</tr>
</tbody>
</table>
</para>