diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh index f26222497..564068c97 100755 --- a/scripts/install/openim-msgtransfer.sh +++ b/scripts/install/openim-msgtransfer.sh @@ -69,12 +69,12 @@ function openim::msgtransfer::check() # NUM_PROCESSES=$(($NUM_PROCESSES - 1)) if [ "$NUM_PROCESSES" -eq "$OPENIM_MSGGATEWAY_NUM" ]; then - openim::log::error_exit "Found $OPENIM_MSGGATEWAY_NUM processes named $OPENIM_OUTPUT_HOSTBIN" + openim::log::info "Found $OPENIM_MSGGATEWAY_NUM processes named $OPENIM_OUTPUT_HOSTBIN" for PID in $PIDS; do ps -p $PID -o pid,cmd done else - echo "Expected $OPENIM_MSGGATEWAY_NUM openim msgtransfer processes, but found $NUM_PROCESSES msgtransfer processes." + openim::log::error_exit "Expected $OPENIM_MSGGATEWAY_NUM openim msgtransfer processes, but found $NUM_PROCESSES msgtransfer processes." fi } diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh index 22b2edc22..7dc0c0c2a 100755 --- a/scripts/lib/logging.sh +++ b/scripts/lib/logging.sh @@ -114,7 +114,7 @@ openim::log::error_exit() { if [[ ${OPENIM_VERBOSE} -ge 4 ]]; then local source_file=${BASH_SOURCE[${stack_skip}]} local source_line=${BASH_LINENO[$((stack_skip - 1))]} - echo_log "!!! Error in ${source_file}:${source_line}" >&2 + echo_log -e "${COLOR_RED}!!! Error in ${source_file}:${source_line} ${COLOR_SUFFIX}" >&2 [[ -z ${1-} ]] || { echo_log " ${1}" >&2 } @@ -207,7 +207,7 @@ openim::log::success() return fi timestamp=$(date +"%m%d %H:%M:%S") - echo_log -e "${BRIGHT_GREEN_PREFIX}[success ${timestamp}] ${COLOR_SUFFIX}==> " "$@" + echo_log -e "${COLOR_GREEN}[success ${timestamp}] ${COLOR_SUFFIX}==> " "$@" } function openim::log::test_log() {