From: Martin Schwenke <martin@meltin.net>
Date: Mon, 9 Jan 2017 04:26:22 +0000 (+1100)
Subject: ctdb-scripts: Drop configuration variable CTDB_SCRIPT_DEBUGLEVEL
X-Git-Tag: talloc-2.1.9~382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3415e5830399d145422ceb35a44531d27ace98;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop configuration variable CTDB_SCRIPT_DEBUGLEVEL

The debug() function, which is the only user of this variable, is no
longer used.  It is also dropped.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 9b0c3207533..f4539685137 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -97,26 +97,6 @@ loadconfig () {
 
 ##############################################################
 
-# CTDB_SCRIPT_DEBUGLEVEL can be overwritten by setting it in a
-# configuration file.
-debug ()
-{
-    if [ "${CTDB_SCRIPT_DEBUGLEVEL:-NOTICE}" = "DEBUG" ] ; then
-	# If there are arguments then echo them.  Otherwise expect to
-	# use stdin, which allows us to pass lots of debug using a
-	# here document.
-	if [ -n "$1" ] ; then
-	    echo "DEBUG: $*"
-	else
-	    sed -e 's@^@DEBUG: @'
-	fi
-    else
-	if [ -z "$1" ] ; then
-	    cat >/dev/null
-	fi
-    fi
-}
-
 die ()
 {
     _msg="$1"
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 9aca804b125..1259fd3e2d5 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1683,20 +1683,6 @@ CTDB_SET_MonitorInterval=20
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>CTDB_SCRIPT_DEBUGLEVEL=<parameter>DEBUGLEVEL</parameter></term>
-	<listitem>
-	  <para>
-	    DEBUGLEVEL is the level debugging messages printed by CTDB
-	    scripts.  Setting this to a higher level (e.g. DEBUG) will
-	    cause some scripts to log more messages.
-	  </para>
-	  <para>
-	    Default is NOTICE.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>CTDB_SUPPRESS_COREFILE=yes|no</term>
 	<listitem>