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
File diff suppressed because it is too large Load Diff
@@ -1,56 +1,62 @@
package org.dna.mqtt.moquette.server; package org.dna.mqtt.moquette.server;
import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession; 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 org.slf4j.Logger; import static org.dna.mqtt.moquette.proto.messages.AbstractMessage.*;
import org.slf4j.LoggerFactory; import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
import org.slf4j.Logger;
import static org.dna.mqtt.moquette.proto.messages.AbstractMessage.*; import org.slf4j.LoggerFactory;
/** /**
* MINA MQTT Handler used to route messages to protocol logic * MINA MQTT Handler used to route messages to protocol logic
* *
* @author andrea * @author andrea
*/ */
public class MQTTHandler extends IoHandlerAdapter { public class MQTTHandler extends IoHandlerAdapter {
private static final Logger LOG = LoggerFactory.getLogger(MQTTHandler.class); private static final Logger LOG = LoggerFactory.getLogger(MQTTHandler.class);
private IMessaging m_messaging; private IMessaging m_messaging;
@Override @Override
public void messageReceived(IoSession session, Object message) throws Exception { public void messageReceived(IoSession session, Object message) throws Exception {
AbstractMessage msg = (AbstractMessage) message; AbstractMessage msg = (AbstractMessage) message;
LOG.info(String.format("Received a message of type %s", Utils.msgType2String(msg.getMessageType()))); LOG.info(String.format("Received a message of type %s", Utils.msgType2String(msg.getMessageType())));
try { try {
switch (msg.getMessageType()) { switch (msg.getMessageType()) {
case CONNECT: case CONNECT:
case SUBSCRIBE: case SUBSCRIBE:
case UNSUBSCRIBE: case UNSUBSCRIBE:
case PUBLISH: case PUBLISH:
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();
} catch (Exception ex) { session.write(pingResp);
LOG.error("Bad error in processing the message", ex); break;
} }
} } catch (Exception ex) {
LOG.error("Bad error in processing the message", ex);
@Override }
public void sessionIdle(IoSession session, IdleStatus status) { }
session.close(false);
} @Override
public void sessionIdle(IoSession session, IdleStatus status) {
public void setMessaging(IMessaging messaging) { if (status == IdleStatus.READER_IDLE) {
m_messaging = messaging; session.close(false);
} //TODO send a notification to messaging part to remove the bining clientID-ConnConfig
}
} }
public void setMessaging(IMessaging messaging) {
m_messaging = messaging;
}
}
+18 -16
View File
@@ -1,17 +1,19 @@
# 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.bechnmark=INFO #log4j.logger.org.dna.mqtt.moquette.proto.PublishDecoder=DEBUG
# A1 is set to be a ConsoleAppender. log4j.logger.org.dna.mqtt.bechnmark=INFO
log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 is set to be a ConsoleAppender.
# A1 uses PatternLayout. log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
@@ -1,26 +1,25 @@
package org.dna.mqtt.moquette.proto; 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 static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
/**
/** *
* * @author andrea
* @author andrea */
*/ public class UtilsTests {
public class UtilsTests {
@Test
@Test public void testEncodeFlags() {
public void testEncodeFlags() { UnsubscribeMessage msg = new UnsubscribeMessage();
UnsubscribeMessage msg = new UnsubscribeMessage(); msg.setRetainFlag(true);
msg.setRetainFlag(true); msg.setQos(AbstractMessage.QOSType.MOST_ONE);
msg.setQos(AbstractMessage.QOSType.MOST_ONE);
//Exercise
//Exercise assertEquals(1, Utils.encodeFlags(msg));
assertEquals(1, Utils.encodeFlags(msg)); }
}
}
}