From: Sage Weil <sage@newdream.net>
Date: Thu, 12 Aug 2010 17:36:00 +0000 (-0700)
Subject: logger: fix logger counter reset
X-Git-Tag: v0.21.2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d00f43aa7edcf9fdb976e9284e7f764ab6b49f09;p=ceph.git

logger: fix logger counter reset

Reset inc keys after each line; reset all keys on full reset.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/common/Logger.cc b/src/common/Logger.cc
index 8444f1d9bf18..757047c3aad9 100644
--- a/src/common/Logger.cc
+++ b/src/common/Logger.cc
@@ -261,10 +261,8 @@ void Logger::_flush()
   if (need_reset || logger_need_reset) {
     // reset the counters
     for (int i=0; i<type->num_keys; i++) {
-      if (type->inc_keys[i]) {
-	this->vals[i] = 0;
-	this->fvals[i] = 0;
-      }
+      this->vals[i] = 0;
+      this->fvals[i] = 0;
     }
     need_reset = false;
   }
@@ -310,6 +308,15 @@ void Logger::_flush()
       }
     }
   }
+
+  // reset the counters
+  for (int i=0; i<type->num_keys; i++) {
+    if (type->inc_keys[i]) {
+      this->vals[i] = 0;
+      this->fvals[i] = 0;
+    }
+  }
+
   out << std::endl;
 }