From f5d765dbffaac72af309a671d5acc7d328eed3fb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 19 Jun 2016 14:50:03 +0100 Subject: [PATCH] Added new fn_script_log vars Depending on the error the script log will now display PASS, FATAL, ERROR, WARN, INFO in the log. --- lgsm/functions/core_messages.sh | 46 ++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/core_messages.sh b/lgsm/functions/core_messages.sh index 972688a6e..7cbb2d1cb 100644 --- a/lgsm/functions/core_messages.sh +++ b/lgsm/functions/core_messages.sh @@ -11,7 +11,7 @@ lgsm_version="210516" # Date, servicename & module details displayed in log files. # e.g Feb 28 14:56:58 ut99-server: Monitor: -fn_scriptlog(){ +fn_script_log(){ if [ -n "${modulename}" ]; then echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${modulename}: ${1}" >> "${scriptlog}" else @@ -19,6 +19,50 @@ fn_scriptlog(){ fi } +fn_script_log_pass(){ + if [ -n "${modulename}" ]; then + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${modulename}: PASS: ${1}" >> "${scriptlog}" + else + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: PASS: ${1}" >> "${scriptlog}" + fi + exitcode=0 +} + +fn_script_log_fatal(){ + if [ -n "${modulename}" ]; then + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${modulename}: FATAL: ${1}" >> "${scriptlog}" + else + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: FATAL: ${1}" >> "${scriptlog}" + fi + exitcode=1 +} + +fn_script_log_error(){ + if [ -n "${modulename}" ]; then + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${modulename}: ERROR: ${1}" >> "${scriptlog}" + else + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ERROR: ${1}" >> "${scriptlog}" + fi + exitcode=2 +} + +fn_script_log_warn(){ + if [ -n "${modulename}" ]; then + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${modulename}: WARN: ${1}" >> "${scriptlog}" + else + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: WARN: ${1}" >> "${scriptlog}" + fi + exitcode=3 +} + +fn_script_log_info(){ + if [ -n "${modulename}" ]; then + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${modulename}: INFO: ${1}" >> "${scriptlog}" + else + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: INFO: ${1}" >> "${scriptlog}" + fi +} + # [ FAIL ] fn_print_fail(){ if [ -n "${modulename}" ]; then