sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

ctdb: Change default debug level to NOTICE (2)

Browse Source 
This was true for the daemon until commit
b4589b954e1090a934fafd3f8e3c2cf1ed785c61.

Defaulting to ERR in the ctdb CLI tool encourages logging notices at
ERR level, so default to NOTICE instead.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2015-02-09 12:04:41 +11:00 committed by Amitay Isaacs
parent 4bbfc54d09
commit 664d62b611
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/common/cmdline.c
View File

@ -37,7 +37,7 @@ static struct {
const char *events;
} ctdb_cmdline = {
.torture = 0,
.debuglevel = "ERR",
.debuglevel = "NOTICE",
};
enum {OPT_EVENTSYSTEM=1};
@ -97,7 +97,7 @@ struct ctdb_context *ctdb_cmdline_init(struct event_context *ev)
/* Set the debug level */
if (!parse_debug(ctdb_cmdline.debuglevel, &DEBUGLEVEL)) {
DEBUGLEVEL = DEBUG_ERR;
DEBUGLEVEL = DEBUG_NOTICE;
}
/* set up the tree to store server ids */
@ -146,7 +146,7 @@ struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev,
/* Set the debug level */
if (!parse_debug(ctdb_cmdline.debuglevel, &DEBUGLEVEL)) {
DEBUGLEVEL = DEBUG_ERR;
DEBUGLEVEL = DEBUG_NOTICE;
}
ret = ctdb_socket_connect(ctdb);

4
ctdb/config/ctdb.sysconfig
View File

@ -25,8 +25,8 @@ CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
# Default is to use the log file below instead of syslog.
# CTDB_LOGGING=file:/var/log/log.ctdb
# Default log level is ERR. NOTICE is a little more verbose.
CTDB_DEBUGLEVEL=NOTICE
# Default log level is NOTICE. Want less logging?
# CTDB_DEBUGLEVEL=ERR
# Set some CTDB tunable variables during CTDB startup?
# CTDB_SET_TraverseTimeout=60

2
ctdb/doc/ctdb.1.xml
View File

@ -206,7 +206,7 @@
<varlistentry><term>-d --debug=<parameter>DEBUGLEVEL</parameter></term>
<listitem>
<para>
Change the debug level for the command. Default is ERR (0).
Change the debug level for the command. Default is NOTICE (2).
</para>
</listitem>
</varlistentry>

4
ctdb/doc/ctdbd.1.xml
View File

@ -52,9 +52,7 @@
<para>
This option sets the debug level to DEBUGLEVEL, which
controls what will be written by the logging
subsystem. The default is 0 which will only log important
events and errors. A larger number will provide additional
logging.
subsystem. The default is 2.
</para>
<para>
See the <citetitle>DEBUG LEVELS</citetitle> section in

2
ctdb/doc/ctdbd.conf.5.xml
View File

@ -202,7 +202,7 @@
<term>CTDB_DEBUGLEVEL=<parameter>DEBUGLEVEL</parameter></term>
<listitem>
<para>
Default is ERR (0). Corresponds to <option>-d</option> or
Default is NOTICE (2). Corresponds to <option>-d</option> or
<option>--debug</option>.
</para>
</listitem>