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

Get the size of the FTL log file upon container startup before starting FTL. We will use this as a starting point to:

Browse Source 
- Check that FTL has started when grepping for the "FTL Started" string
 - Position to start tailing from when streaming the log file

We wait for a maximum of 30 seconds for FTL to start, else we exit the container

Co-authored-by: yubiuser <github@yubiuser.dev>
Co-authored-by: casperklein <casperklein@users.noreply.github.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2025-11-06 17:56:07 +00:00
parent e23e759aa6
commit acf2db2d5e
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/start.sh
View File

@@ -58,6 +58,13 @@ start() {
fix_capabilities
sh /opt/pihole/pihole-FTL-prestart.sh
# Get the FTL log file path from the config
FTLlogFile=$(getFTLConfigValue files.log.ftl)
# Get the EOF position of the FTL log file so that we can tail from there later.
local startFrom
startFrom=$(stat -c%s "${FTLlogFile}")
echo " [i] Starting pihole-FTL ($FTL_CMD) as ${DNSMASQ_USER}"
echo ""
@@ -70,18 +77,11 @@ start() {
# We need the PID of the capsh process so that we can wait for it to finish
CAPSH_PID=$!
# Get the FTL log file path from the config
FTLlogFile=$(getFTLConfigValue files.log.ftl)
# Wait until the log file exists before continuing
while [ ! -f "${FTLlogFile}" ]; do
sleep 0.5
done
# Wait until the FTL log contains the "FTL started" message before continuing
while ! grep -q '########## FTL started' "${FTLlogFile}"; do
sleep 0.5
done
# Wait for FTL to start by monitoring the FTL log file for the "FTL started" line
if ! timeout 30 tail -F -c +$((startFrom + 1)) -- "${FTLlogFile}" | grep -q '########## FTL started'; then
echo " [!] ERROR: FTL failed to start within 30 seconds, stopping container"
exit 1
fi
pihole updatechecker
local versionsOutput
@@ -91,11 +91,8 @@ start() {
echo ""
if [ "${TAIL_FTL_LOG:-1}" -eq 1 ]; then
# Start tailing the FTL log from the most recent "FTL Started" message
# Get the line number
startFrom=$(grep -n '########## FTL started' "${FTLlogFile}" | tail -1 | cut -d: -f1)
# Start the tail from the line number and background it
tail --follow=name -n +"${startFrom}" "${FTLlogFile}" &
# Start tailing the FTL log file from the EOF position we recorded on container start
tail -F -c +$((startFrom + 1)) -- "${FTLlogFile}" &
else
echo " [i] FTL log output is disabled. Remove the Environment variable TAIL_FTL_LOG, or set it to 1 to enable FTL log output."
fi
@@ -104,7 +101,6 @@ start() {
wait $CAPSH_PID
FTL_EXIT_CODE=$?
# If we are here, then FTL has exited.
# If the trap was triggered, then stop will have already been called
if [ $TRAP_TRIGGERED -eq 0 ]; then