public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-16 03:15:59 +00:00
Code Issues Releases Wiki Activity

Fix timing accuracy and simplify final status reporting

Browse Source 
Co-authored-by: DerLinkman <62480600+DerLinkman@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-12-11 12:41:19 +00:00
parent a98a5b298d
commit de3d617840
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/Dockerfiles/clamd/clamd.sh
View File

@@ -109,11 +109,14 @@ clamd_is_ready() {
# Wait for clamd to be ready or until timeout # Wait for clamd to be ready or until timeout
ELAPSED=0 ELAPSED=0
POLL_INTERVAL=10 POLL_INTERVAL=10
CLAMD_READY=0
while [ ${ELAPSED} -lt ${STARTUP_GRACE_PERIOD} ]; do while [ ${ELAPSED} -lt ${STARTUP_GRACE_PERIOD} ]; do
# Check if clamd is responsive by attempting to connect on localhost # Check if clamd is responsive by attempting to connect on localhost
# clamd listens on 0.0.0.0:3310 (configured in Dockerfile) # clamd listens on 0.0.0.0:3310 (configured in Dockerfile)
if clamd_is_ready; then if clamd_is_ready; then
echo "clamd is ready after ${ELAPSED} seconds" echo "clamd is ready after ${ELAPSED} seconds"
CLAMD_READY=1
break break
fi fi
@@ -121,12 +124,12 @@ while [ ${ELAPSED} -lt ${STARTUP_GRACE_PERIOD} ]; do
ELAPSED=$((ELAPSED + POLL_INTERVAL)) ELAPSED=$((ELAPSED + POLL_INTERVAL))
done done
if [ ${ELAPSED} -ge ${STARTUP_GRACE_PERIOD} ]; then # Report final status
# Check one more time if clamd is actually running if [ ${CLAMD_READY} -eq 0 ]; then
if ! clamd_is_ready; then if clamd_is_ready; then
echo "Warning: clamd did not respond to PING within ${STARTUP_GRACE_PERIOD} seconds - it may still be starting up" echo "clamd is now ready (started during final check)"
else else
echo "clamd is now ready" echo "Warning: clamd did not respond to PING within ${STARTUP_GRACE_PERIOD} seconds - it may still be starting up"
fi fi
fi fi