mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-25 06:10:20 +00:00
Merge pull request #2053 from pi-hole/tweak/debug-logs
Get head and tail of pihole-FTL.log during debug process
This commit is contained in:
commit
d4870b3854
1 changed files with 31 additions and 3 deletions
|
@ -592,7 +592,7 @@ ping_gateway() {
|
||||||
# Try to quietly ping the gateway 3 times, with a timeout of 3 seconds, using numeric output only,
|
# Try to quietly ping the gateway 3 times, with a timeout of 3 seconds, using numeric output only,
|
||||||
# on the pihole interface, and tail the last three lines of the output
|
# on the pihole interface, and tail the last three lines of the output
|
||||||
# If pinging the gateway is not successful,
|
# If pinging the gateway is not successful,
|
||||||
if ! ${cmd} -c 3 -W 2 -n ${gateway} -I ${PIHOLE_INTERFACE} >/dev/null; then
|
if ! ${cmd} -c 1 -W 2 -n ${gateway} -I ${PIHOLE_INTERFACE} >/dev/null; then
|
||||||
# let the user know
|
# let the user know
|
||||||
log_write "${CROSS} ${COL_RED}Gateway did not respond.${COL_NC} ($FAQ_GATEWAY)\n"
|
log_write "${CROSS} ${COL_RED}Gateway did not respond.${COL_NC} ($FAQ_GATEWAY)\n"
|
||||||
# and return an error code
|
# and return an error code
|
||||||
|
@ -613,7 +613,7 @@ ping_internet() {
|
||||||
ping_ipv4_or_ipv6 "${protocol}"
|
ping_ipv4_or_ipv6 "${protocol}"
|
||||||
log_write "* Checking Internet connectivity via IPv${protocol}..."
|
log_write "* Checking Internet connectivity via IPv${protocol}..."
|
||||||
# Try to ping the address 3 times
|
# Try to ping the address 3 times
|
||||||
if ! ${cmd} -W 2 -c 3 -n ${public_address} -I ${PIHOLE_INTERFACE} >/dev/null; then
|
if ! ${cmd} -c 1 -W 2 -n ${public_address} -I ${PIHOLE_INTERFACE} >/dev/null; then
|
||||||
# if it's unsuccessful, show an error
|
# if it's unsuccessful, show an error
|
||||||
log_write "${CROSS} ${COL_RED}Cannot reach the Internet.${COL_NC}\n"
|
log_write "${CROSS} ${COL_RED}Cannot reach the Internet.${COL_NC}\n"
|
||||||
return 1
|
return 1
|
||||||
|
@ -958,7 +958,7 @@ list_files_in_dir() {
|
||||||
"${PIHOLE_WEB_SERVER_ERROR_LOG_FILE}") make_array_from_file "${dir_to_parse}/${each_file}" 25
|
"${PIHOLE_WEB_SERVER_ERROR_LOG_FILE}") make_array_from_file "${dir_to_parse}/${each_file}" 25
|
||||||
;;
|
;;
|
||||||
# Same for the FTL log
|
# Same for the FTL log
|
||||||
"${PIHOLE_FTL_LOG}") make_array_from_file "${dir_to_parse}/${each_file}" 25
|
"${PIHOLE_FTL_LOG}") head_tail_log "${dir_to_parse}/${each_file}" 35
|
||||||
;;
|
;;
|
||||||
# parse the file into an array in case we ever need to analyze it line-by-line
|
# parse the file into an array in case we ever need to analyze it line-by-line
|
||||||
*) make_array_from_file "${dir_to_parse}/${each_file}";
|
*) make_array_from_file "${dir_to_parse}/${each_file}";
|
||||||
|
@ -991,6 +991,34 @@ show_content_of_pihole_files() {
|
||||||
show_content_of_files_in_dir "${LOG_DIRECTORY}"
|
show_content_of_files_in_dir "${LOG_DIRECTORY}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
head_tail_log() {
|
||||||
|
# The file being processed
|
||||||
|
local filename="${1}"
|
||||||
|
# The number of lines to use for head and tail
|
||||||
|
local qty="${2}"
|
||||||
|
local head_line
|
||||||
|
local tail_line
|
||||||
|
# Put the current Internal Field Separator into another variable so it can be restored later
|
||||||
|
OLD_IFS="$IFS"
|
||||||
|
# Get the lines that are in the file(s) and store them in an array for parsing later
|
||||||
|
IFS=$'\r\n'
|
||||||
|
local log_head=()
|
||||||
|
log_head=( $(head -n ${qty} ${filename}) )
|
||||||
|
log_write " ${COL_CYAN}-----head of $(basename ${filename})------${COL_NC}"
|
||||||
|
for head_line in "${log_head[@]}"; do
|
||||||
|
log_write " ${head_line}"
|
||||||
|
done
|
||||||
|
log_write ""
|
||||||
|
local log_tail=()
|
||||||
|
log_tail=( $(tail -n ${qty} ${filename}) )
|
||||||
|
log_write " ${COL_CYAN}-----tail of $(basename ${filename})------${COL_NC}"
|
||||||
|
for tail_line in "${log_tail[@]}"; do
|
||||||
|
log_write " ${tail_line}"
|
||||||
|
done
|
||||||
|
# Set the IFS back to what it was
|
||||||
|
IFS="$OLD_IFS"
|
||||||
|
}
|
||||||
|
|
||||||
analyze_gravity_list() {
|
analyze_gravity_list() {
|
||||||
echo_current_diagnostic "Gravity list"
|
echo_current_diagnostic "Gravity list"
|
||||||
local head_line
|
local head_line
|
||||||
|
|
Loading…
Reference in a new issue