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

Use FTL's build-in wait-for command for checking the logs

Browse Source 
Signed-off-by: yubiuser <github@yubiuser.dev>
This commit is contained in:
yubiuser
2025-09-24 10:04:13 +02:00
parent 5ff925b66f
commit 647f6c94ea
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/start.sh
View File

@@ -75,10 +75,9 @@ start() {
sleep 0.5 sleep 0.5
done done
# Wait until the FTL log contains the "FTL started" message before continuing # Wait until the FTL log contains the "FTL started" message before continuing, timeout after 10 seconds
while ! grep -q '########## FTL started' /var/log/pihole/FTL.log; do logsize_before=$(stat -c%s /var/log/pihole/FTL.log)
sleep 0.5 pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 "${logsize_before}" > /dev/null
done
pihole updatechecker pihole updatechecker
local versionsOutput 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 # 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): def test_pihole_ftl_clean_shutdown(docker):
func = docker.run( func = docker.run(
""" """