From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 18 May 2016 10:28:41 +0000 (+0200)
Subject: Ensure the `logmessages` statistic is increased.
X-Git-Tag: auth-4.0.0-beta1~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3886%2Fhead;p=thirdparty%2Fpdns.git

Ensure the `logmessages` statistic is increased.

When a message is sent to the console or syslog, increase the
logmessages counter.

Closes #3855
---

diff --git a/pdns/logger.cc b/pdns/logger.cc
index 35e3efd113..4d1d3708b9 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -44,6 +44,7 @@ Logger &theL(const string &pname)
 
 void Logger::log(const string &msg, Urgency u)
 {
+  bool mustAccount(false);
   struct tm tm;
   time_t t;
   time(&t);
@@ -55,13 +56,17 @@ void Logger::log(const string &msg, Urgency u)
     static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
     Lock l(&m); // the C++-2011 spec says we need this, and OSX actually does
     clog << string(buffer) + msg <<endl;
+    mustAccount=true;
   }
   if( u <= d_loglevel && !d_disableSyslog ) {
+    syslog(u,"%s",msg.c_str());
+    mustAccount=true;
+  }
+
 #ifndef RECURSOR
+  if(mustAccount)
     S.ringAccount("logmessages",msg);
 #endif
-    syslog(u,"%s",msg.c_str());
-  }
 }
 
 void Logger::setLoglevel( Urgency u )