Fixed issue 5, was due to bad read timeout management in IoSession.idle.

This commit is contained in:
andrea
2012-09-17 11:29:13 +02:00
parent ecea97f409
commit 9df2669839
4 changed files with 649 additions and 642 deletions
@@ -4,7 +4,6 @@ import com.lmax.disruptor.BatchEventProcessor;
import com.lmax.disruptor.EventHandler; import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.SequenceBarrier; import com.lmax.disruptor.SequenceBarrier;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -16,9 +15,10 @@ import org.apache.mina.core.session.IoSession;
import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition; import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
import org.dna.mqtt.moquette.messaging.spi.IMessaging; import org.dna.mqtt.moquette.messaging.spi.IMessaging;
import org.dna.mqtt.moquette.messaging.spi.IStorageService; import org.dna.mqtt.moquette.messaging.spi.IStorageService;
import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore; import org.dna.mqtt.moquette.messaging.spi.impl.HawtDBStorageService.StoredMessage;
import org.dna.mqtt.moquette.messaging.spi.impl.events.*; import org.dna.mqtt.moquette.messaging.spi.impl.events.*;
import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription; import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
import org.dna.mqtt.moquette.proto.PubCompMessage; import org.dna.mqtt.moquette.proto.PubCompMessage;
import org.dna.mqtt.moquette.proto.messages.*; import org.dna.mqtt.moquette.proto.messages.*;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType; import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
@@ -27,7 +27,6 @@ import org.dna.mqtt.moquette.server.Constants;
import org.dna.mqtt.moquette.server.IAuthenticator; import org.dna.mqtt.moquette.server.IAuthenticator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.dna.mqtt.moquette.messaging.spi.impl.HawtDBStorageService.StoredMessage;
/** /**
* *
@@ -241,6 +240,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
m_clientIDs.put(msg.getClientID(), connDescr); m_clientIDs.put(msg.getClientID(), connDescr);
int keepAlive = msg.getKeepAlive(); int keepAlive = msg.getKeepAlive();
LOG.debug(String.format("Connect with keepAlive %d s", keepAlive));
session.setAttribute("keepAlive", keepAlive); session.setAttribute("keepAlive", keepAlive);
session.setAttribute(Constants.CLEAN_SESSION, msg.isCleanSession()); session.setAttribute(Constants.CLEAN_SESSION, msg.isCleanSession());
//used to track the client in the subscription and publishing phases. //used to track the client in the subscription and publishing phases.
@@ -6,11 +6,11 @@ import org.apache.mina.core.session.IoSession;
import org.dna.mqtt.moquette.messaging.spi.IMessaging; import org.dna.mqtt.moquette.messaging.spi.IMessaging;
import org.dna.mqtt.moquette.proto.Utils; import org.dna.mqtt.moquette.proto.Utils;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage; import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import static org.dna.mqtt.moquette.proto.messages.AbstractMessage.*;
import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import static org.dna.mqtt.moquette.proto.messages.AbstractMessage.*;
/** /**
* MINA MQTT Handler used to route messages to protocol logic * MINA MQTT Handler used to route messages to protocol logic
* *
@@ -34,10 +34,13 @@ public class MQTTHandler extends IoHandlerAdapter {
case PUBREC: case PUBREC:
case PUBCOMP: case PUBCOMP:
case PUBREL: case PUBREL:
case PINGREQ:
case DISCONNECT: case DISCONNECT:
m_messaging.handleProtocolMessage(session, msg); m_messaging.handleProtocolMessage(session, msg);
break; break;
case PINGREQ:
PingRespMessage pingResp = new PingRespMessage();
session.write(pingResp);
break;
} }
} catch (Exception ex) { } catch (Exception ex) {
LOG.error("Bad error in processing the message", ex); LOG.error("Bad error in processing the message", ex);
@@ -46,7 +49,10 @@ public class MQTTHandler extends IoHandlerAdapter {
@Override @Override
public void sessionIdle(IoSession session, IdleStatus status) { public void sessionIdle(IoSession session, IdleStatus status) {
session.close(false); if (status == IdleStatus.READER_IDLE) {
session.close(false);
//TODO send a notification to messaging part to remove the bining clientID-ConnConfig
}
} }
public void setMessaging(IMessaging messaging) { public void setMessaging(IMessaging messaging) {
+4 -2
View File
@@ -1,11 +1,13 @@
# Set root logger level to DEBUG and its only appender to A1. # Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=ERROR, A1 #log4j.rootLogger=ERROR, A1
#log4j.rootLogger=DEBUG, A1 log4j.rootLogger=INFO, A1
#log4j.rootLogger=WARN, A1 #log4j.rootLogger=WARN, A1
#log4j.logger.org.dna.mqtt.moquette.client=WARN #log4j.logger.org.dna.mqtt.moquette.client=WARN
#log4j.logger.org.mina=WARN #log4j.logger.org.mina=WARN
#log4j.logger.org.dna.mqtt.moquette.server=DEBUG #log4j.logger.org.dna.mqtt.moquette.server=DEBUG
#log4j.logger.org.dna.mqtt.moquette.messaging=DEBUG #log4j.logger.org.dna.mqtt.moquette.messaging=DEBUG
#log4j.logger.org.dna.mqtt.moquette.proto.MQTTLoggingFilter=DEBUG
#log4j.logger.org.dna.mqtt.moquette.proto.PublishDecoder=DEBUG
log4j.logger.org.dna.mqtt.bechnmark=INFO log4j.logger.org.dna.mqtt.bechnmark=INFO
@@ -2,9 +2,8 @@ package org.dna.mqtt.moquette.proto;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage; import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage; import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Test;
/** /**
* *