regen2
/
ezbuild
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

split this into 2 functions

This commit is contained in:
belliash 2012-01-12 12:16:48 +01:00
parent e82239e82f
commit 78760a6b63
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/common
View File

@ -51,12 +51,7 @@ function checkVersion() {
# Parameters: %message% %code% # Parameters: %message% %code%
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
function die() { function die() {
if isEnabled ${LOGGING} && isSet NOTIFY && isEnabled ${EZNOTIFY}; then notify "${1}" ${2}
local LOGS="Full output from logs:\n\n$(cat ${LOGFILE})"
local MESG="The ${EZNAME} has failed with code: ${2} and message: ${1}"
local TOPIC="The ${EZNAME} process has failed!"
echo -e "${MESG}\n${LOGS}" | mailx -s "${TOPIC}" "${NOTIFY}"
fi
printError "${1}" printError "${1}"
echo -ne "\n" echo -ne "\n"
exit ${2} exit ${2}
@ -171,6 +166,19 @@ function logOutput() {
fi fi
} }
#-------------------------------------------------------------------------------
# Sends an e-mail notification about occured error
# Parameters: %message% %code%
#-------------------------------------------------------------------------------
function notify() {
if isEnabled ${LOGGING} && isSet NOTIFY && isEnabled ${EZNOTIFY}; then
local LOGS="Full output from logs:\n\n$(cat ${LOGFILE})"
local MESG="The ${EZNAME} has failed with code: ${2} and message: ${1}"
local TOPIC="The ${EZNAME} process has failed!"
echo -e "${MESG}\n${LOGS}" | mailx -s "${TOPIC}" "${NOTIFY}"
fi
}
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Outputs error message and aborts program execution # Outputs error message and aborts program execution
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------