From 647f6c94eae696bb7d468a80ff8616f0c9b45919 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Wed, 24 Sep 2025 10:04:13 +0200 Subject: [PATCH] Use FTL's build-in wait-for command for checking the logs Signed-off-by: yubiuser --- src/start.sh | 7 +++---- test/tests/test_general.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/start.sh b/src/start.sh index 3361a53..2a5e68b 100644 --- a/src/start.sh +++ b/src/start.sh @@ -75,10 +75,9 @@ start() { sleep 0.5 done - # Wait until the FTL log contains the "FTL started" message before continuing - while ! grep -q '########## FTL started' /var/log/pihole/FTL.log; do - sleep 0.5 - done + # Wait until the FTL log contains the "FTL started" message before continuing, timeout after 10 seconds + logsize_before=$(stat -c%s /var/log/pihole/FTL.log) + pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 "${logsize_before}" > /dev/null pihole updatechecker local versionsOutput diff --git a/test/tests/test_general.py b/test/tests/test_general.py index d5fef0a..70b9ab7 100644 --- a/test/tests/test_general.py +++ b/test/tests/test_general.py @@ -50,7 +50,7 @@ def test_pihole_ftl_architecture(docker): # Wait 5 seconds for startup, then kill the start.sh script -# Finally, grep the FTL log to see if it has been shut down cleanly +# Finally, check the FTL log to see if it has been shut down cleanly def test_pihole_ftl_clean_shutdown(docker): func = docker.run( """