Merge pull request apache#1764 from metamx/enableLogging

Enable logging for memcached in factory
metamx · Sep 23, 2015 · a5718ee · a5718ee
2 parents 5dd5fc7 + 4308aa9
commit a5718ee
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/server/src/main/java/io/druid/client/cache/MemcachedCache.java b/server/src/main/java/io/druid/client/cache/MemcachedCache.java
@@ -46,6 +46,7 @@
 import net.spy.memcached.MemcachedClientIF;
 import net.spy.memcached.internal.BulkFuture;
 import net.spy.memcached.metrics.MetricCollector;
+import net.spy.memcached.metrics.MetricType;
 import net.spy.memcached.ops.LinkedOperationQueueFactory;
 import net.spy.memcached.ops.OperationQueueFactory;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -133,6 +134,9 @@ private Map<String, Long> getCurrentValues()
             for (Map.Entry<String, AtomicLong> entry : counters.entrySet()) {
               builder.put(entry.getKey(), entry.getValue().get());
             }
+            for (Map.Entry<String, AtomicLong> entry : meters.entrySet()) {
+              builder.put(entry.getKey(), entry.getValue().get());
+            }
             return builder.build();
           }
         };
@@ -344,6 +348,7 @@ public void updateHistogram(String name, int amount)
           .setReadBufferSize(config.getReadBufferSize())
           .setOpQueueFactory(opQueueFactory)
           .setMetricCollector(metricCollector)
+          .setEnableMetrics(MetricType.DEBUG) // Not as scary as it sounds
           .build();
 
       final List<InetSocketAddress> hosts = AddrUtil.getAddresses(config.getHosts());