Bug 194531 - db2bak is too noisy

https://bugzilla.redhat.com/show_bug.cgi?id=194531

Description: Introduced "-q" option to suppress the backing up/
restoring message for each db file.
  Usage: db2bak [archivedir] [-q] [-h]
  Usage: bak2db archivedir [-n backendname] [-q] | [-h]
If "-q" is specified, the verbose messages are not prited to
the standard error, but just to the errors log.

In addition, new log level SLAPI_LOG_BACKLDBM/LDAP_DEBUG_BACKLDBM
has been introduced.

2 files changed, 56 insertions, 16 deletions

diff --git a/ldap/admin/src/scripts/template-bak2db.in b/ldap/admin/src/scripts/template-bak2db.in
index 12d46ca1..0f926678 100755
--- a/ldap/admin/src/scripts/template-bak2db.in
+++ b/ldap/admin/src/scripts/template-bak2db.in
@@ -12,21 +12,38 @@ export LD_LIBRARY_PATH
 SHLIB_PATH=$LD_LIBRARY_PATH
 export SHLIB_PATH
 
-if [ $# -lt 1 ] || [ $# -gt 3 ]
+if [ $# -lt 1 ] || [ $# -gt 6 ]
 then
-    echo "Usage: bak2db archivedir [-n backendname]"
+    echo "Usage: bak2db archivedir [-n backendname] [-q] | [-h]"
     exit 1
+elif [ "$1" = "-h" ]
+then
+    echo "Usage: bak2db archivedir [-n backendname] [-q] | [-h]"
+    exit 0
 else
     archivedir=$1
     shift
 fi
-while getopts "n:" flag
+benameopt=""
+dlevel=0
+quiet=0
+while getopts "hn:qd:" flag
 do
     case $flag in
-        n) bename=$OPTARG;;
-        *) echo "Usage: bak2db archivedir [-n backendname]"; exit 2;;
+        h) echo "Usage: bak2db archivedir [-n backendname] [-q] | [-h]"
+           exit 1;;
+        n) benameopt="-n $OPTARG";;
+        q) quiet=1;;
+        d) dlevel=$OPTARG;;
     esac
 done
+if [ $quiet -eq 0 ]
+then
+  if [ $dlevel -ne 524288 ]
+  then
+    dlevel=`expr $dlevel + 524288`
+  fi
+fi
 
 if [ 1 = `expr $archivedir : "\/"` ]
 then
@@ -37,9 +54,4 @@ else
 fi
 
 cd {{SERVERBIN-DIR}}
-if [ "$#" -eq 2 ]
-then
-    ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir -n $bename
-else
-    ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir
-fi
+./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir $benameopt -d $dlevel
diff --git a/ldap/admin/src/scripts/template-db2bak.in b/ldap/admin/src/scripts/template-db2bak.in
index a0fe1f59..5ff5d078 100755
--- a/ldap/admin/src/scripts/template-db2bak.in
+++ b/ldap/admin/src/scripts/template-db2bak.in
@@ -12,13 +12,41 @@ export LD_LIBRARY_PATH
 SHLIB_PATH=$LD_LIBRARY_PATH
 export SHLIB_PATH
 
+if [ $# -gt 4 ]
+then
+    echo "Usage: db2bak [archivedir] [-q] [-h]"
+    exit 1
+fi
+
+bak_dir={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H_%M_%S`
+dlevel=0
+quiet=0
 cd {{SERVERBIN-DIR}}
-if [ "$#" -eq 1 ]
+if [ "$#" -gt 0 ]
+then
+  if [ "$1" != "-q" ] && [ "$1" != "-d" ] && [ "$1" != "-h" ]
+  then
+    bak_dir=$1
+    shift
+  fi
+  while getopts "hqd:" flag
+  do
+    case $flag in
+        h) echo "Usage: db2bak [archivedir] [-q] [-h]"
+           exit 0;;
+        q) quiet=1;;
+        d) dlevel=$OPTARG;;
+    esac
+  done
+fi
+# If not quiet, set LDAP_DEBUG_BACKLDBM to debug level
+if [ $quiet -eq 0 ]
 then
-	bak_dir=$1
-else
-	bak_dir={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H_%M_%S`
+  if [ $dlevel -ne 524288 ]
+  then
+    dlevel=`expr $dlevel + 524288`
+  fi
 fi
 
 echo "Back up directory: $bak_dir"
-./ns-slapd db2archive -D {{CONFIG-DIR}} -a $bak_dir
+./ns-slapd db2archive -D {{CONFIG-DIR}} -a $bak_dir -d $dlevel