Improve the DNS cache expiration log message.

[user/henk/code/inspircd.git] / src / coremods / core_dns.cpp

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index 8532179fbc995c4b9b4a65d75775fdd4be3d5dc1..2e75a591f7c1b1acf547c2238378481a8304584a 100644 (file)
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -1,8 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Adam <Adam@anope.org>
- *   Copyright (C) 2003-2013 Anope Team <team@anope.org>
+ *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2015, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2015-2016 Adam <Adam@anope.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -538,6 +540,25 @@ class MyManager : public Manager, public Timer, public EventHandler
                }
        }
 
+       std::string GetTypeStr(QueryType qt) CXX11_OVERRIDE
+       {
+               switch (qt)
+               {
+                       case QUERY_A:
+                               return "A";
+                       case QUERY_AAAA:
+                               return "AAAA";
+                       case QUERY_CNAME:
+                               return "CNAME";
+                       case QUERY_PTR:
+                               return "PTR";
+                       case QUERY_TXT:
+                               return "TXT";
+                       default:
+                               return "UNKNOWN";
+               }
+       }
+
        void OnEventHandlerError(int errcode) CXX11_OVERRIDE
        {
                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "UDP socket got an error event");
@@ -661,16 +682,22 @@ class MyManager : public Manager, public Timer, public EventHandler
 
        bool Tick(time_t now) CXX11_OVERRIDE
        {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: purging DNS cache");
-
+               unsigned long expired = 0;
                for (cache_map::iterator it = this->cache.begin(); it != this->cache.end(); )
                {
                        const Query& query = it->second;
                        if (IsExpired(query, now))
+                       {
+                               expired++;
                                this->cache.erase(it++);
+                       }
                        else
                                ++it;
                }
+
+               if (expired)
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: purged %lu expired DNS entries", expired);
+
                return true;
        }