summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/common/cmdline.c6
-rw-r--r--ctdb/config/ctdb.sysconfig4
-rw-r--r--ctdb/doc/ctdb.1.xml2
-rw-r--r--ctdb/doc/ctdbd.1.xml4
-rw-r--r--ctdb/doc/ctdbd.conf.5.xml2
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>