[PATCH] Add STATE logging level for state save/restore output

[Anthony Foiani <anthony dot foiani at gmail dot com>]

# HG changeset patch
# User Anthony Foiani <anthony.foiani@gmail.com>
# Date 1287551966 21600
# Node ID ac8870f6eeedc53e5920b844d4494aeaed2cfe4d
# Parent  333eafe07ada312a547c9ea680dc801860d23f62
Add STATE logging level for state save/restore output.

The save/restore state output is voluminous; using this flag allows us
to quickly see or ignore when something is just being saved.

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>

diff -r 333eafe07ada -r ac8870f6eeed scripts/functions
--- a/scripts/functions	Tue Oct 19 13:54:58 2010 -0600
+++ b/scripts/functions	Tue Oct 19 23:19:26 2010 -0600
@@ -1,4 +1,4 @@
-# This file contains some usefull common functions
+# This file contains some usefull common functions -*- sh -*-
 # Copyright 2007 Yann E. MORIN
 # Licensed under the GPL v2. See COPYING in the root of this package
 
@@ -51,8 +51,9 @@
 CT_LOG_LEVEL_EXTRA=3
 CT_LOG_LEVEL_CFG=4
 CT_LOG_LEVEL_FILE=5
-CT_LOG_LEVEL_ALL=6
-CT_LOG_LEVEL_DEBUG=7
+CT_LOG_LEVEL_STATE=6
+CT_LOG_LEVEL_ALL=7
+CT_LOG_LEVEL_DEBUG=8
 
 # Make it easy to use \n and !
 CR=$(printf "\n")
@@ -961,15 +962,15 @@
         CT_DoLog DEBUG "  Saving '${dir}'"
         { tar c -C "${dir}" -v -f - "${extra_tar_opts[@]}" .    \
           |"${compress[@]}" >"${tarball}.tar${tar_ext}"         ;
-        } 2>&1 |sed -r -e 's/^/    /;' |CT_DoLog DEBUG
+        } 2>&1 |sed -r -e 's/^/    /;' |CT_DoLog STATE
     else
-        CT_DoLog DEBUG "  Not saving '${dir}': does not exist"
+        CT_DoLog STATE "  Not saving '${dir}': does not exist"
     fi
 }
 
 # This function extracts a tarball to the specified directory, but
 # only if the tarball exists
-# Usage: CT_DoTarballIfExists <tarball_basename> <dir> [extra_tar_options [...]]
+# Usage: CT_DoExtractTarballIfExists <tarball_basename> <dir> [extra_tar_options [...]]
 CT_DoExtractTarballIfExists() {
     local tarball="$1"
     local dir="$2"
@@ -988,9 +989,9 @@
         CT_DoExecLog DEBUG mkdir -p "${dir}"
         { "${uncompress[@]}" "${tarball}.tar${tar_ext}"     \
           |tar x -C "${dir}" -v -f - "${extra_tar_opts[@]}" ;
-        } 2>&1 |sed -r -e 's/^/    /;' |CT_DoLog DEBUG
+        } 2>&1 |sed -r -e 's/^/    /;' |CT_DoLog STATE
     else
-        CT_DoLog DEBUG "  Not restoring '${dir}': does not exist"
+        CT_DoLog STATE "  Not restoring '${dir}': does not exist"
     fi
 }
 
@@ -1008,7 +1009,7 @@
     rm -rf "${state_dir}"
     mkdir -p "${state_dir}"
 
-    CT_DoLog DEBUG "  Saving environment and aliases"
+    CT_DoLog STATE "  Saving environment and aliases"
     # We must omit shell functions, and some specific bash variables
     # that break when restoring the environment, later. We could do
     # all the processing in the awk script, but a sed is easier...
@@ -1030,7 +1031,7 @@
     CT_DoTarballIfExists "${CT_PREFIX_DIR}" "${state_dir}/prefix_dir" --exclude '*.log'
 
     if [ "${CT_LOG_TO_FILE}" = "y" ]; then
-        CT_DoLog DEBUG "  Saving log file"
+        CT_DoLog STATE "  Saving log file"
         exec >/dev/null
         case "${CT_DEBUG_CT_SAVE_STEPS_GZIP}" in
             y)  gzip -3 -c "${CT_LOG_FILE}"  >"${state_dir}/log.gz";;
@@ -1068,7 +1069,7 @@
 
     # Restore the environment, discarding any error message
     # (for example, read-only bash internals)
-    CT_DoLog DEBUG "  Restoring environment"
+    CT_DoLog STATE "  Restoring environment"
     . "${state_dir}/env.sh" >/dev/null 2>&1 || true
 
     # Restore the new RESTART and STOP steps
@@ -1077,7 +1078,7 @@
     unset old_stop old_restart
 
     if [ "${CT_LOG_TO_FILE}" = "y" ]; then
-        CT_DoLog DEBUG "  Restoring log file"
+        CT_DoLog STATE "  Restoring log file"
         exec >/dev/null
         case "${CT_DEBUG_CT_SAVE_STEPS_GZIP}" in
             y)  zcat "${state_dir}/log.gz" >"${CT_LOG_FILE}";;

--
For unsubscribe information see http://sourceware.org/lists.html#faq