Send stdout to log, and actually populate error message

This commit is contained in:
William Wernert
2021-04-12 12:59:45 -04:00
parent 5d98c896a3
commit 73a1bdd885
2 changed files with 2 additions and 2 deletions

View File

@@ -164,7 +164,7 @@ check_hive_init() {
check_manager_state() {
echo "Checking state of manager services. This may take a moment..."
retry 2 15 "__check_so_status" && retry 2 15 "__check_salt_master" && return 0 || return 1
retry 2 15 "__check_so_status" >> $setup_log 2>&1 && retry 2 15 "__check_salt_master" >> $setup_log 2>&1 && return 0 || return 1
}
__check_so_status() {

View File

@@ -1147,7 +1147,7 @@ whiptail_manager_adv_service_zeeklogs() {
whiptail_manager_error() {
local msg
read -r -d '' <<- EOM
read -r -d '' msg <<- EOM
Setup could not determine if the manager $MSRV is in a good state.
Continuing without verifying all services on the manager are running may result in a failure.