From a3f06f7e3310791097037694396e4f407efd3612 Mon Sep 17 00:00:00 2001 From: andrea Date: Tue, 16 Jun 2015 23:08:26 +0200 Subject: [PATCH] Reenabled the logging of bytes moved --- .../eclipse/moquette/server/netty/NettyAcceptor.java | 10 +++++++--- .../server/netty/metrics/MessageMetricsCollector.java | 2 -- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java index 6fbea90a..ac485f5d 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java @@ -93,7 +93,7 @@ public class NettyAcceptor implements ServerAcceptor { EventLoopGroup m_bossGroup; EventLoopGroup m_workerGroup; - //BytesMetricsCollector m_metricsCollector = new BytesMetricsCollector(); + BytesMetricsCollector m_bytesMetricsCollector = new BytesMetricsCollector(); MessageMetricsCollector m_metricsCollector = new MessageMetricsCollector(); @Override @@ -147,6 +147,7 @@ public class NettyAcceptor implements ServerAcceptor { pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, Constants.DEFAULT_CONNECT_TIMEOUT)); pipeline.addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimoutHandler()); //pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR)); + pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector)); pipeline.addLast("decoder", new MQTTDecoder()); pipeline.addLast("encoder", new MQTTEncoder()); pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); @@ -180,6 +181,7 @@ public class NettyAcceptor implements ServerAcceptor { pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder()); pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, Constants.DEFAULT_CONNECT_TIMEOUT)); pipeline.addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimoutHandler()); + pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector)); pipeline.addLast("decoder", new MQTTDecoder()); pipeline.addLast("encoder", new MQTTEncoder()); pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); @@ -240,10 +242,10 @@ public class NettyAcceptor implements ServerAcceptor { final SslHandler sslHandler = new SslHandler(engine); pipeline.addLast("ssl", sslHandler); - //pipeline.addFirst("metrics", new BytesMetricsHandler(m_metricsCollector)); pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, Constants.DEFAULT_CONNECT_TIMEOUT)); pipeline.addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimoutHandler()); //pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR)); + pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));pipeline.addFirst("metrics", new BytesMetricsHandler(m_bytesMetricsCollector)); pipeline.addLast("decoder", new MQTTDecoder()); pipeline.addLast("encoder", new MQTTEncoder()); pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); @@ -263,8 +265,10 @@ public class NettyAcceptor implements ServerAcceptor { m_bossGroup.shutdownGracefully(); MessageMetrics metrics = m_metricsCollector.computeMetrics(); - //LOG.info(String.format("Bytes read: %d, bytes wrote: %d", metrics.readBytes(), metrics.wroteBytes())); LOG.info("Msg read: {}, msg wrote: {}", metrics.messagesRead(), metrics.messagesWrote()); + + BytesMetrics bytesMetrics = m_bytesMetricsCollector.computeMetrics(); + LOG.info(String.format("Bytes read: %d, bytes wrote: %d", bytesMetrics.readBytes(), bytesMetrics.wroteBytes())); } private InputStream jksDatastore(String jksPath) throws FileNotFoundException { diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java index 9971428f..d84e5f93 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java +++ b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java @@ -15,8 +15,6 @@ */ package org.eclipse.moquette.server.netty.metrics; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicLong; /**