Merge remote-tracking branch 'gphat/master'

Conflicts: project/build/KestrelProject.scala src/main/scala/net/lag/kestrel/PersistentQueue.scala
twitter-archive · Mar 21, 2012 · 58a75aa · 58a75aa
2 parents 9028333 + 8c41a90
commit 58a75aa
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/scala/net/lag/kestrel/PersistentQueue.scala b/src/main/scala/net/lag/kestrel/PersistentQueue.scala
@@ -405,6 +405,11 @@ class PersistentQueue(val name: String, persistencePath: String, @volatile var c
     Stats.clearGauge(statNamed("waiters"))
     Stats.clearGauge(statNamed("open_transactions"))
     Stats.clearGauge(statNamed("create_time"))
+    Stats.removeMetric(statNamed("set_latency_usec"))
+    Stats.removeMetric(statNamed("get_timeout_msec"))
+    Stats.removeMetric(statNamed("delivery_latency_msec"))
+    Stats.removeMetric(statNamed("get_hit_latency_usec"))
+    Stats.removeMetric(statNamed("get_miss_latency_usec"))
   }
 
   private final def nextXid(): Int = {