Merge pull request #280 from fjcyue/master
using reader idle to trigger the will message.
This commit is contained in:
@@ -33,7 +33,7 @@ class MoquetteIdleTimeoutHandler extends ChannelDuplexHandler {
|
|||||||
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
|
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
|
||||||
if (evt instanceof IdleStateEvent) {
|
if (evt instanceof IdleStateEvent) {
|
||||||
IdleState e = ((IdleStateEvent) evt).state();
|
IdleState e = ((IdleStateEvent) evt).state();
|
||||||
if (e == IdleState.ALL_IDLE) {
|
if (e == IdleState.READER_IDLE) {
|
||||||
LOG.info("Firing channel inactive event. MqttClientId = {}.", NettyUtils.clientID(ctx.channel()));
|
LOG.info("Firing channel inactive event. MqttClientId = {}.", NettyUtils.clientID(ctx.channel()));
|
||||||
// fire a channelInactive to trigger publish of Will
|
// fire a channelInactive to trigger publish of Will
|
||||||
ctx.fireChannelInactive();
|
ctx.fireChannelInactive();
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ public class NettyAcceptor implements ServerAcceptor {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
void init(ChannelPipeline pipeline) {
|
void init(ChannelPipeline pipeline) {
|
||||||
pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, nettyChannelTimeoutSeconds));
|
pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
|
||||||
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
||||||
// pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR));
|
// pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR));
|
||||||
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
||||||
@@ -224,7 +224,7 @@ public class NettyAcceptor implements ServerAcceptor {
|
|||||||
new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
|
new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
|
||||||
pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
|
pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
|
||||||
pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
|
pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
|
||||||
pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, nettyChannelTimeoutSeconds));
|
pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
|
||||||
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
||||||
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
||||||
pipeline.addLast("decoder", new MqttDecoder());
|
pipeline.addLast("decoder", new MqttDecoder());
|
||||||
@@ -261,7 +261,7 @@ public class NettyAcceptor implements ServerAcceptor {
|
|||||||
@Override
|
@Override
|
||||||
void init(ChannelPipeline pipeline) throws Exception {
|
void init(ChannelPipeline pipeline) throws Exception {
|
||||||
pipeline.addLast("ssl", createSslHandler(sslContext, needsClientAuth));
|
pipeline.addLast("ssl", createSslHandler(sslContext, needsClientAuth));
|
||||||
pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, nettyChannelTimeoutSeconds));
|
pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
|
||||||
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
||||||
// pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR));
|
// pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR));
|
||||||
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
||||||
@@ -304,7 +304,7 @@ public class NettyAcceptor implements ServerAcceptor {
|
|||||||
new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
|
new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
|
||||||
pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
|
pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
|
||||||
pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
|
pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
|
||||||
pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, nettyChannelTimeoutSeconds));
|
pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
|
||||||
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
|
||||||
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
|
||||||
pipeline.addLast("decoder", new MqttDecoder());
|
pipeline.addLast("decoder", new MqttDecoder());
|
||||||
|
|||||||
@@ -446,7 +446,7 @@ public class ProtocolProcessor {
|
|||||||
if (pipeline.names().contains("idleStateHandler")) {
|
if (pipeline.names().contains("idleStateHandler")) {
|
||||||
pipeline.remove("idleStateHandler");
|
pipeline.remove("idleStateHandler");
|
||||||
}
|
}
|
||||||
pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, idleTime));
|
pipeline.addFirst("idleStateHandler", new IdleStateHandler(idleTime, 0, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class ProtocolDecodingServer {
|
|||||||
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
|
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
|
||||||
if (evt instanceof IdleStateEvent) {
|
if (evt instanceof IdleStateEvent) {
|
||||||
IdleState e = ((IdleStateEvent) evt).state();
|
IdleState e = ((IdleStateEvent) evt).state();
|
||||||
if (e == IdleState.ALL_IDLE) {
|
if (e == IdleState.READER_IDLE) {
|
||||||
//fire a channelInactive to trigger publish of Will
|
//fire a channelInactive to trigger publish of Will
|
||||||
ctx.fireChannelInactive();
|
ctx.fireChannelInactive();
|
||||||
ctx.close();
|
ctx.close();
|
||||||
@@ -86,7 +86,7 @@ public class ProtocolDecodingServer {
|
|||||||
public void initChannel(SocketChannel ch) throws Exception {
|
public void initChannel(SocketChannel ch) throws Exception {
|
||||||
ChannelPipeline pipeline = ch.pipeline();
|
ChannelPipeline pipeline = ch.pipeline();
|
||||||
try {
|
try {
|
||||||
pipeline.addFirst("idleStateHandler", new IdleStateHandler(0, 0, 2));
|
pipeline.addFirst("idleStateHandler", new IdleStateHandler(2, 0, 0));
|
||||||
pipeline.addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimeoutHandler());
|
pipeline.addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimeoutHandler());
|
||||||
pipeline.addLast("decoder", new MqttDecoder());
|
pipeline.addLast("decoder", new MqttDecoder());
|
||||||
pipeline.addLast("encoder", MqttEncoder.INSTANCE);
|
pipeline.addLast("encoder", MqttEncoder.INSTANCE);
|
||||||
|
|||||||
Reference in New Issue
Block a user