Exit with code 1 when the check script fails

pull/2026/head
skiffer-git 2 years ago
parent a1f0eb2e3e
commit b9088f0b47

@ -102,6 +102,17 @@ function openim::tools::start_service() {
fi fi
openim::log::status "Starting binary ${binary_name}..." openim::log::status "Starting binary ${binary_name}..."
${cmd} | tee -a "${LOG_FILE}" ${cmd} | tee -a "${LOG_FILE}"
ehco "11111111111111file: " ${LOG_FILE} $TMP_LOG_FILE
${cmd} >> "${LOG_FILE}" 2>&1
local status=$?
if [ $status -eq 0 ]; then
openim::log::info "Service ${binary_name} started successfully."
return 0
else
openim::log::error "Failed to start service ${binary_name}."
return 1
fi
} }
function openim::tools::start() { function openim::tools::start() {
@ -115,11 +126,15 @@ function openim::tools::start() {
function openim::tools::pre-start() { function openim::tools::pre-start() {
openim::log::info "Preparing to start OpenIM Tools..." openim::log::info "Preparing to start OpenIM Tools..."
for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do for tool in "${OPENIM_TOOLS_PRE_START_NAME_LISTARIES[@]}"; do
openim::log::info "Starting tool ${tool}..." openim::log::info "Starting tool ${tool}..."
openim::tools::start_service ${tool} ${OPNEIM_CONFIG} if ! openim::tools::start_service ${tool} ${OPNEIM_CONFIG}; then
done openim::log::error "Failed to start ${tool}, aborting..."
return 1
fi
done
openim::log::info "All tools started successfully."
} }
function openim::tools::post-start() { function openim::tools::post-start() {

@ -84,7 +84,14 @@ fi
TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh
openim::log::status "\n## Pre Starting OpenIM services" openim::log::status "\n## Pre Starting OpenIM services"
${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start
if ! ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start; then
openim::log::error "Pre Starting OpenIM services failed, aborting..."
exit 1
fi
result=$("${OPENIM_ROOT}"/scripts/stop-all.sh) result=$("${OPENIM_ROOT}"/scripts/stop-all.sh)

Loading…
Cancel
Save