CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-22 00:43:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

timestamp logging for wait_for_salt_minion

Browse Source
This commit is contained in:
Josh Patterson
2025-12-12 16:30:42 -05:00
parent a3396b77a3
commit 1475f0fc2f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
salt/common/tools/sbin/so-common
View File

@@ -560,12 +560,12 @@ wait_for_salt_minion() {
local logfile="${4:-'/dev/stdout'}" local logfile="${4:-'/dev/stdout'}"
local elapsed=0 local elapsed=0
echo "Waiting for salt-minion '$minion' to be ready..." | tee -a "$logfile" echo "$(date '+%a %d %b %Y %H:%M:%S.%6N') - Waiting for salt-minion '$minion' to be ready..." | tee -a "$logfile"
while [ $elapsed -lt $max_wait ]; do while [ $elapsed -lt $max_wait ]; do
# Check if service is running # Check if service is running
if ! systemctl is-active --quiet salt-minion; then if ! systemctl is-active --quiet salt-minion; then
echo "salt-minion service not running (elapsed: ${elapsed}s)" | tee -a "$logfile" echo "$(date '+%a %d %b %Y %H:%M:%S.%6N') - salt-minion service not running (elapsed: ${elapsed}s)" | tee -a "$logfile"
sleep $interval sleep $interval
elapsed=$((elapsed + interval)) elapsed=$((elapsed + interval))
continue continue
@@ -573,16 +573,16 @@ wait_for_salt_minion() {
# Check if minion responds to ping # Check if minion responds to ping
if salt "$minion" test.ping --timeout=3 --out=json 2>> "$logfile" | grep -q "true"; then if salt "$minion" test.ping --timeout=3 --out=json 2>> "$logfile" | grep -q "true"; then
echo "salt-minion '$minion' is connected and ready!" | tee -a "$logfile" echo "$(date '+%a %d %b %Y %H:%M:%S.%6N') - salt-minion '$minion' is connected and ready!" | tee -a "$logfile"
return 0 return 0
fi fi
echo "Waiting... (${elapsed}s / ${max_wait}s)" | tee -a "$logfile" echo "$(date '+%a %d %b %Y %H:%M:%S.%6N') - Waiting... (${elapsed}s / ${max_wait}s)" | tee -a "$logfile"
sleep $interval sleep $interval
elapsed=$((elapsed + interval)) elapsed=$((elapsed + interval))
done done
echo "ERROR: salt-minion '$minion' not ready after $max_wait seconds" | tee -a "$logfile" echo "$(date '+%a %d %b %Y %H:%M:%S.%6N') - ERROR: salt-minion '$minion' not ready after $max_wait seconds" | tee -a "$logfile"
return 1 return 1
} }