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>
(Imported from commit 664d62b61108657d3011cf0bcbe260533c97676f)

diff --git a/common/cmdline.c b/common/cmdline.c
index cd59d84757bb237086b3c33bd858f114c3008d2c..ca214b431b60841b6c1e7e33645c3dd8980d6aa4 100644 (file)
--- a/common/cmdline.c
+++ b/common/cmdline.c
@@ -35,7 +35,7 @@ static struct {
        const char *events;
 } ctdb_cmdline = {
        .torture = 0,
-       .debuglevel = "ERR",
+       .debuglevel = "NOTICE",
 };
 
 enum {OPT_EVENTSYSTEM=1};

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index d96fb8e4df72cf621dd5174f939b2151cc661db4..a819219f93fe1cbb6fc2f3aefabf25fe2526b890 100644 (file)
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -26,8 +26,8 @@ CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
 # CTDB_LOGFILE=/var/log/log.ctdb
 # CTDB_SYSLOG=no
 
-# 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/doc/ctdb.1.xml b/doc/ctdb.1.xml
index ccd46d6db22c24a82a53c4dcb67d10f7d45ff208..ead860a5c59e76083da6be827b5fd1a78d5f9924 100644 (file)
--- a/doc/ctdb.1.xml
+++ b/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/doc/ctdbd.1.xml b/doc/ctdbd.1.xml
index 080f5061c0933fa0a7546a82fac0ece3e466d90f..56309a482720a819c5d7e5d2d8b855585dbdc75c 100644 (file)
--- a/doc/ctdbd.1.xml
+++ b/doc/ctdbd.1.xml
@@ -50,10 +50,8 @@
        <term>-d, --debug=<parameter>DEBUGLEVEL</parameter></term>
        <listitem>
          <para>
-           This option sets the debug level to DEBUGLEVEL, which
-           controls what will be written to the logfile. The default is
-           0 which will only log important events and errors. A larger
-           number will provide additional logging.
+           This option sets the debug level to DEBUGLEVEL, which controls
+           what will be written to the logfile. The default is 2.
          </para>
          <para>
            See the <citetitle>DEBUG LEVELS</citetitle> section in

diff --git a/doc/ctdbd.conf.5.xml b/doc/ctdbd.conf.5.xml
index a99ae9bee2c880ead0b2c471e3a1c3b9711de4ab..9067aed0c47bd47c2491b8d6e7de2b546f8f0254 100644 (file)
--- a/doc/ctdbd.conf.5.xml
+++ b/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>