Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-19 18:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1898 from pi-hole/wait-for

Browse Source 
Use FTL's build-in wait-for command for checking the logs
This commit is contained in:
Adam Warner
2025-09-30 18:42:36 +01:00
committed by GitHub
parent 5ff925b66f 53baec4b81
commit 4554d61176
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/start.sh
View File

@@ -75,10 +75,13 @@ 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
# exit if we do not find it
pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 "0 > /dev/null"
if [ $? -ne 0 ]; then
echo " [✗] FTL did not start - stopping container"
exit 1
fi
pihole updatechecker
local versionsOutput

2
test/tests/test_general.py
View File

@@ -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(
"""