remove usage of color in log and save env to file
diff --git a/hudson-scripts/init/_0_log.sh b/hudson-scripts/init/_0_log.sh
index 01892a8..ae99ed3 100644
--- a/hudson-scripts/init/_0_log.sh
+++ b/hudson-scripts/init/_0_log.sh
@@ -27,7 +27,7 @@
LS_OUTPUT=${LS_OUTPUT:-/dev/stdout}
# XXX need more flexible templating, currently manual padding for level names
#LS_DEFAULT_FMT=${LS_DEFAULT_FMT:-'[$_LS_LEVEL_STR][${FUNCNAME[1]}:${BASH_LINENO[0]}]'}
-LS_DEFAULT_FMT=${LS_DEFAULT_FMT:-'%b[%s][%s:%s] %s%b\n'}
+LS_DEFAULT_FMT=${LS_DEFAULT_FMT:-'%-10s %s [%s:%s]\n'}
LS_DEBUG_LEVEL=10
LS_INFO_LEVEL=20
@@ -38,11 +38,11 @@
# LS_LEVELS structure:
# Level, Level Name, Level Format, Before Log Entry, After Log Entry
LS_LEVELS=(
- $LS_DEBUG_LEVEL 'DEBUG' '\e[0;32m' '\e[0m'
- $LS_INFO_LEVEL 'INFO' '\e[0;34m' '\e[0m'
- $LS_WARNING_LEVEL 'WARNING' '\e[0;33m' '\e[0m'
- $LS_ERROR_LEVEL 'ERROR' '\e[0;31m' '\e[0m'
- $LS_CRITICAL_LEVEL 'CRITICAL' '\e[0;37;41m' '\e[0m'
+ $LS_DEBUG_LEVEL '[DEBUG]' '\e[0;32m' '\e[0m'
+ $LS_INFO_LEVEL '[INFO]' '\e[0;34m' '\e[0m'
+ $LS_WARNING_LEVEL '[WARNING]' '\e[0;33m' '\e[0m'
+ $LS_ERROR_LEVEL '[ERROR]' '\e[0;31m' '\e[0m'
+ $LS_CRITICAL_LEVEL '[CRITICAL]' '\e[0;37;41m' '\e[0m'
)
_LS_FIND_LEVEL_STR () {
@@ -52,8 +52,8 @@
for ((i=0; i<${#LS_LEVELS[@]}; i+=4)); do
if [[ "$LEVEL" == "${LS_LEVELS[i]}" ]]; then
_LS_LEVEL_STR="${LS_LEVELS[i+1]}"
- _LS_LEVEL_BEGIN="${LS_LEVELS[i+2]}"
- _LS_LEVEL_END="${LS_LEVELS[i+3]}"
+ #_LS_LEVEL_BEGIN="${LS_LEVELS[i+2]}"
+ #_LS_LEVEL_END="${LS_LEVELS[i+3]}"
return 0
fi
done
@@ -72,7 +72,7 @@
# if no message was passed, read it from STDIN
local _MSG
[[ $# -ne 0 ]] && _MSG="$@" || _MSG="$(cat)"
- printf "$LS_DEFAULT_FMT" "$_LS_LEVEL_BEGIN" "$_LS_LEVEL_STR" "${FUNCNAME[1]}" "${BASH_LINENO[0]}" "$_MSG" "$_LS_LEVEL_END" >> "$LS_OUTPUT"
+ printf "$LS_DEFAULT_FMT" "$_LS_LEVEL_STR" "$_MSG" "$(basename ${BASH_SOURCE[1]})" "${BASH_LINENO[0]}" >> "$LS_OUTPUT"
}
shopt -s expand_aliases
diff --git a/hudson-scripts/init/_1_trap.sh b/hudson-scripts/init/_1_trap.sh
index ed8a805..3038eb2 100644
--- a/hudson-scripts/init/_1_trap.sh
+++ b/hudson-scripts/init/_1_trap.sh
@@ -13,11 +13,8 @@
__onExit() {
local RETURN=$?
- LSDEBUG "Program will exit, printing the environment variables for later debugging"
- for e in $(env|sort);
- do
- echo " $e"
- done
+ LSDEBUG "Program will exit, saving the environment variables to a file for later debugging"
+ echo $(env|sort) > env.txt
if [ $RETURN -ne 0 -a $RETURN -lt 129 -o $RETURN -gt 165 ]; then
LSCRITICAL "An error occurred"
