improved coding standards. options parsing. verbose logging

This commit is contained in:
Patrick Stadler
2015-03-11 22:02:00 +01:00
parent 9858beb329
commit 5c65c6646f
10 changed files with 115 additions and 39 deletions

View File

@@ -3,11 +3,10 @@ for util in ./lib/utils/*.sh; do source $util; done
# init
__METRICS=()
__TEMP_DIR=$(make_temp_dir)
# load reporter
main_load () {
# load reporter
source ./reporters/${REPORTER}.sh
copy_function init __r_${REPORTER}_init
copy_function report __r_${REPORTER}_report
@@ -34,6 +33,14 @@ main_load () {
}
main_init () {
TEMP_DIR=$(make_temp_dir)
# register trap
trap '
main_terminate
trap - SIGTERM && kill -- -$$ SIGINT SIGTERM EXIT
' SIGINT SIGTERM EXIT
# init reporter
if is_function __r_${REPORTER}_init; then
__r_${REPORTER}_init
@@ -49,19 +56,6 @@ main_init () {
done
}
main_docs () {
echo "Available metrics:"
for metric in ${__METRICS[@]}; do
if ! is_function __m_${metric}_docs; then
continue
fi
echo "[$metric]"
__m_${metric}_docs
echo
done
}
main_collect () {
# used by metrics to return results
report () {
@@ -105,4 +99,22 @@ main_terminate () {
if is_function __r_${REPORTER}_terminate; then
__r_${REPORTER}_terminate
fi
# delete temporary directory
if [ ! -z $TEMP_DIR ] && [ -d $TEMP_DIR ]; then
rmdir $TEMP_DIR
fi
}
main_docs () {
echo "Available metrics:"
for metric in ${__METRICS[@]}; do
if ! is_function __m_${metric}_docs; then
continue
fi
echo "[$metric]"
__m_${metric}_docs
echo
done
}

16
lib/utils/verbose.sh Normal file
View File

@@ -0,0 +1,16 @@
VERBOSE_MODE=false
verbose_on () {
VERBOSE_MODE=true
}
verbose_off () {
VERBOSE_MODE=true
}
verbose () {
if [ $VERBOSE_MODE = "false" ]; then
return
fi
echo "$@"
}