pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port more verbose DNSSEC logging to FTL' dnsmasq debug mode

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2021-06-16 22:20:57 +02:00
parent 8271978be3
commit 56610126e7
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+2 -1
View File
@@ -25,6 +25,7 @@
"files.associations": {
"config.h": "c",
"stdint.h": "c",
"stdint-gcc.h": "c"
"stdint-gcc.h": "c",
"dnsmasq.h": "c"
}
}
src/dnsmasq/cache.c
+5 -3
View File
@@ -1978,11 +1978,13 @@ if(debug_dnsmasq_lines != 0)
{
if (option_bool(OPT_EXTRALOG))
{
int port = prettyprint_addr(daemon->log_source_addr, daemon->addrbuff2);
if (flags & F_NOEXTRA)
my_syslog(LOG_INFO, "* %s/%u %s %s %s %s (%s:%d)", daemon->addrbuff2, port, source, name, verb, dest, file, line);
my_syslog(LOG_INFO, "%u %s %s %s %s (%s:%d)", daemon->log_display_id, source, name, verb, dest, file, line);
else
my_syslog(LOG_INFO, "%u %s/%u %s %s %s %s (%s:%d)", daemon->log_display_id, daemon->addrbuff2, port, source, name, verb, dest, file, line);
{
int port = prettyprint_addr(daemon->log_source_addr, daemon->addrbuff2);
my_syslog(LOG_INFO, "%u %s/%u %s %s %s %s (%s:%d)", daemon->log_display_id, daemon->addrbuff2, port, source, name, verb, dest, file, line);
}
}
else
my_syslog(LOG_INFO, "%s %s %s %s (%s:%d)", source, name, verb, dest, file, line);
test/run.sh
+5
View File
@@ -94,7 +94,12 @@ test/libs/bats/bin/bats "test/test_suite.bats"
RET=$?
if [[ $RET != 0 ]]; then
echo -n "pihole.log: "
openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /var/log/pihole.log
echo ""
echo -n "pihole-FTL.log: "
openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /var/log/pihole-FTL.log
echo ""
fi
# Kill pihole-FTL after having completed tests
test/test_suite.bats
+6
View File
@@ -495,18 +495,24 @@
}
@test "No WARNING messages in pihole-FTL.log (besides known capability issues)" {
run bash -c 'grep "WARNING" /var/log/pihole-FTL.log'
printf "%s\n" "${lines[@]}"
run bash -c 'grep "WARNING" /var/log/pihole-FTL.log | grep -c -v -E "CAP_NET_ADMIN|CAP_NET_RAW|CAP_SYS_NICE"'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "0" ]]
}
@test "No ERROR messages in pihole-FTL.log" {
run bash -c 'grep "ERROR" /var/log/pihole-FTL.log'
printf "%s\n" "${lines[@]}"
run bash -c 'grep -c "ERROR" /var/log/pihole-FTL.log'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "0" ]]
}
@test "No FATAL messages in pihole-FTL.log (besides error due to starting FTL more than once)" {
run bash -c 'grep "FATAL" /var/log/pihole-FTL.log'
printf "%s\n" "${lines[@]}"
run bash -c 'grep "FATAL:" /var/log/pihole-FTL.log | grep -c -v "FATAL: create_shm(): Failed to create shared memory object \"FTL-lock\": File exists"'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "0" ]]