From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 17 Mar 2014 08:26:26 +0000 (+0100)
Subject: fix statistics when running with pdns-distributes-queries. Closes issue #1333.
X-Git-Tag: rec-3.6.0-rc1~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d299d4f5ec6985ef439d3c546ee31ec1b5d868dc;p=thirdparty%2Fpdns.git

fix statistics when running with pdns-distributes-queries. Closes issue #1333.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 78f99db3c7..a729cf6fd4 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1113,11 +1113,11 @@ void doStats(void)
 {
   static time_t lastOutputTime;
   static uint64_t lastQueryCount;
+
+  uint64_t cacheHits = broadcastAccFunction<uint64_t>(pleaseGetCacheHits);
+  uint64_t cacheMisses = broadcastAccFunction<uint64_t>(pleaseGetCacheMisses);
   
-  if(g_stats.qcounter && (t_RC->cacheHits + t_RC->cacheMisses) && SyncRes::s_queries && SyncRes::s_outqueries) {  // this only runs once thread 0 has had hits
-    uint64_t cacheHits = broadcastAccFunction<uint64_t>(pleaseGetCacheHits);
-    uint64_t cacheMisses = broadcastAccFunction<uint64_t>(pleaseGetCacheMisses);
-    
+  if(g_stats.qcounter && (cacheHits + cacheMisses) && SyncRes::s_queries && SyncRes::s_outqueries) {
     L<<Logger::Warning<<"stats: "<<g_stats.qcounter<<" questions, "<<
       broadcastAccFunction<uint64_t>(pleaseGetCacheSize)<< " cache entries, "<<
       broadcastAccFunction<uint64_t>(pleaseGetNegCacheSize)<<" negative entries, "<<