diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-02-09 12:04:41 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-02-18 05:34:06 +0100 |
| commit | 664d62b61108657d3011cf0bcbe260533c97676f (patch) | |
| tree | 1c4896860caa880617ee38497736956e28319903 | |
| parent | 4bbfc54d09d813d1fb827de5855ce40e8eab1095 (diff) | |
| download | samba-664d62b61108657d3011cf0bcbe260533c97676f.tar.gz | |
ctdb: Change default debug level to NOTICE (2)
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>
| -rw-r--r-- | ctdb/common/cmdline.c | 6 | ||||
| -rw-r--r-- | ctdb/config/ctdb.sysconfig | 4 | ||||
| -rw-r--r-- | ctdb/doc/ctdb.1.xml | 2 | ||||
| -rw-r--r-- | ctdb/doc/ctdbd.1.xml | 4 | ||||
| -rw-r--r-- | ctdb/doc/ctdbd.conf.5.xml | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c index 4ed3fae64d7..7fcb91f83a8 100644 --- a/ctdb/common/cmdline.c +++ b/ctdb/common/cmdline.c @@ -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); diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig index b44e478b937..9541d503c75 100644 --- a/ctdb/config/ctdb.sysconfig +++ b/ctdb/config/ctdb.sysconfig @@ -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 diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml index 1a1ae40fbec..e95caa0a89a 100644 --- a/ctdb/doc/ctdb.1.xml +++ b/ctdb/doc/ctdb.1.xml @@ -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> diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml index fc17acf7d02..b5feea2fe65 100644 --- a/ctdb/doc/ctdbd.1.xml +++ b/ctdb/doc/ctdbd.1.xml @@ -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 diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml index 52c1298f414..8a62c86615b 100644 --- a/ctdb/doc/ctdbd.conf.5.xml +++ b/ctdb/doc/ctdbd.conf.5.xml @@ -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> |