From 1475f0fc2fb711eeda3921d9ca3888d5046e1f7f Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Fri, 12 Dec 2025 16:30:42 -0500 Subject: [PATCH] timestamp logging for wait_for_salt_minion --- salt/common/tools/sbin/so-common | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index 798bd34ba..93a34fdf1 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -560,12 +560,12 @@ wait_for_salt_minion() { local logfile="${4:-'/dev/stdout'}" 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 # Check if service is running 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 elapsed=$((elapsed + interval)) continue @@ -573,16 +573,16 @@ wait_for_salt_minion() { # Check if minion responds to ping 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 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 elapsed=$((elapsed + interval)) 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 }