Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment thread
yubiuser marked this conversation as resolved.
Outdated
pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 "${logsize_before}" > /dev/null
Comment thread
yubiuser marked this conversation as resolved.
Outdated

pihole updatechecker
local versionsOutput
Expand Down
2 changes: 1 addition & 1 deletion test/tests/test_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
"""
Expand Down