From: Tom Gundersen <teg@jklm.no>
Date: Mon, 17 Aug 2015 06:38:48 +0000 (+0200)
Subject: resolved: cache - clarify logging
X-Git-Tag: v227~132^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04f93201207d76e01598d4a431de5da5739014c9;p=thirdparty%2Fsystemd.git

resolved: cache - clarify logging
---

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index cbbbed8c8a4..05518c3f894 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -277,13 +277,14 @@ static int dns_cache_put_positive(
 
         /* New TTL is 0? Delete the entry... */
         if (rr->ttl <= 0) {
-                if (dns_cache_remove(c, rr->key)) {
-                        r = dns_resource_key_to_string(rr->key, &key_str);
-                        if (r < 0)
-                                return r;
+                r = dns_resource_key_to_string(rr->key, &key_str);
+                if (r < 0)
+                        return r;
 
+                if (dns_cache_remove(c, rr->key))
                         log_debug("Removed zero TTL entry from cache: %s", key_str);
-                }
+                else
+                        log_debug("Not caching zero TTL cache entry: %s", key_str);
 
                 return 0;
         }
@@ -361,7 +362,7 @@ static int dns_cache_put_negative(
                 if (r < 0)
                         return r;
 
-                log_debug("Ignored negative cache entry with zero SOA TTL: %s", key_str);
+                log_debug("Not caching negative entry with zero SOA TTL: %s", key_str);
 
                 return 0;
         }