Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inotify: make "flushed" log message more understandable.

Browse Source 
Saying we've "flushed x outdated entries" is confusing, since
the count is the total number of entries in the modified file,
most of which are going	to get added straight back when	the file
is re-read.

The log now looks like

dnsmasq: inotify: /tmp/dir/1 (new or modified)
dnsmasq: inotify: flushed 1 addresses read from /tmp/dir/1
dnsmasq: read /tmp/dir/1 - 2 addresses

which hopefully make it more obvious that /tmp/dir/1 contained one
address before, and now contains two.
This commit is contained in:
Simon Kelley
2022-10-27 13:14:45 +01:00
parent 92c32e0bac
commit 34fac952b6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/inotify.c
View File

@@ -296,9 +296,9 @@ int inotify_check(time_t now)
/* Is this is a deletion event? */ /* Is this is a deletion event? */
if (in->mask & IN_DELETE) if (in->mask & IN_DELETE)
my_syslog(LOG_INFO, _("inotify: %s (removed)"), path); my_syslog(LOG_INFO, _("inotify: %s removed"), path);
else else
my_syslog(LOG_INFO, _("inotify: %s (new or modified)"), path); my_syslog(LOG_INFO, _("inotify: %s new or modified"), path);
if (dd->flags & AH_HOSTS) if (dd->flags & AH_HOSTS)
{ {
@@ -306,7 +306,7 @@ int inotify_check(time_t now)
{ {
const unsigned int removed = cache_remove_uid(ah->index); const unsigned int removed = cache_remove_uid(ah->index);
if (removed > 0) if (removed > 0)
my_syslog(LOG_INFO, _("flushed %u outdated entries"), removed); my_syslog(LOG_INFO, _("inotify: flushed %u addresses read from %s"), removed, path);
/* (Re-)load hostsfile only if this event isn't triggered by deletion */ /* (Re-)load hostsfile only if this event isn't triggered by deletion */
if (!(in->mask & IN_DELETE)) if (!(in->mask & IN_DELETE))