Moved publish message handling inside event loop
This commit is contained in:
@@ -14,19 +14,6 @@ import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
|
|||||||
*/
|
*/
|
||||||
public interface IMessaging {
|
public interface IMessaging {
|
||||||
|
|
||||||
/**
|
|
||||||
* Publish a message on the messaging system. The qos is the level of quality
|
|
||||||
* the retain flag is true iff the message should be persisted for future
|
|
||||||
* notification also after all the current subscriber to the given topic has
|
|
||||||
* been notified.
|
|
||||||
*/
|
|
||||||
void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, IoSession session);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used to publish messages with QoS > 0
|
|
||||||
* */
|
|
||||||
void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, int messageID, IoSession session);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Subscribe a client to a specified topic with a defined level
|
* Subscribe a client to a specified topic with a defined level
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -113,14 +113,14 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent>/*,
|
|||||||
m_ringBuffer.publish(sequence);
|
m_ringBuffer.publish(sequence);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
public void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, IoSession session) {
|
public void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, IoSession session) {
|
||||||
disruptorPublish(new PublishEvent(topic, qos, message, retain, clientID, session));
|
disruptorPublish(new PublishEvent(topic, qos, message, retain, clientID, session));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, int messageID, IoSession session) {
|
public void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, int messageID, IoSession session) {
|
||||||
disruptorPublish(new PublishEvent(topic, qos, message, retain, clientID, messageID, session));
|
disruptorPublish(new PublishEvent(topic, qos, message, retain, clientID, messageID, session));
|
||||||
}
|
} */
|
||||||
|
|
||||||
public void subscribe(String clientId, String topic, QOSType qos, boolean cleanSession, int messageID) {
|
public void subscribe(String clientId, String topic, QOSType qos, boolean cleanSession, int messageID) {
|
||||||
Subscription newSubscription = new Subscription(clientId, topic, qos, cleanSession);
|
Subscription newSubscription = new Subscription(clientId, topic, qos, cleanSession);
|
||||||
@@ -139,7 +139,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent>/*,
|
|||||||
}
|
}
|
||||||
|
|
||||||
//method used by hte Notifier to re-put an event on the inbound queue
|
//method used by hte Notifier to re-put an event on the inbound queue
|
||||||
private void refill(MessagingEvent evt) throws InterruptedException {
|
private void refill(MessagingEvent evt) {
|
||||||
disruptorPublish(evt);
|
disruptorPublish(evt);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,6 +223,19 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent>/*,
|
|||||||
AbstractMessage message = ((ProtocolEvent) evt).getMessage();
|
AbstractMessage message = ((ProtocolEvent) evt).getMessage();
|
||||||
if (message instanceof ConnectMessage) {
|
if (message instanceof ConnectMessage) {
|
||||||
processConnect(session, (ConnectMessage) message);
|
processConnect(session, (ConnectMessage) message);
|
||||||
|
} else if (message instanceof PublishMessage) {
|
||||||
|
PublishMessage pubMsg = (PublishMessage) message;
|
||||||
|
PublishEvent pubEvt;
|
||||||
|
|
||||||
|
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
|
||||||
|
|
||||||
|
if (message.getQos() == QOSType.MOST_ONE) {
|
||||||
|
pubEvt = new PublishEvent(pubMsg.getTopicName(), pubMsg.getQos(), pubMsg.getPayload(), pubMsg.isRetainFlag(), clientID, session);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
pubEvt = new PublishEvent(pubMsg.getTopicName(), pubMsg.getQos(), pubMsg.getPayload(), pubMsg.isRetainFlag(), clientID, pubMsg.getMessageID(), session);
|
||||||
|
}
|
||||||
|
processPublish(pubEvt);
|
||||||
} else {
|
} else {
|
||||||
throw new RuntimeException("Illegal message received " + message);
|
throw new RuntimeException("Illegal message received " + message);
|
||||||
}
|
}
|
||||||
@@ -283,8 +296,9 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent>/*,
|
|||||||
//Handle will flag
|
//Handle will flag
|
||||||
if (msg.isWillFlag()) {
|
if (msg.isWillFlag()) {
|
||||||
QOSType willQos = QOSType.values()[msg.getWillQos()];
|
QOSType willQos = QOSType.values()[msg.getWillQos()];
|
||||||
publish(msg.getWillTopic(), msg.getWillMessage().getBytes(),
|
PublishEvent pubEvt = new PublishEvent(msg.getWillTopic(), willQos, msg.getWillMessage().getBytes(),
|
||||||
willQos, msg.isWillRetain(), msg.getClientID(), session);
|
msg.isWillRetain(), msg.getClientID(), session);
|
||||||
|
processPublish(pubEvt);
|
||||||
}
|
}
|
||||||
|
|
||||||
//handle user authentication
|
//handle user authentication
|
||||||
@@ -316,7 +330,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent>/*,
|
|||||||
session.write(okResp);
|
session.write(okResp);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void processPublish(PublishEvent evt) throws InterruptedException {
|
protected void processPublish(PublishEvent evt) {
|
||||||
LOG.debug("processPublish invoked");
|
LOG.debug("processPublish invoked");
|
||||||
final String topic = evt.getTopic();
|
final String topic = evt.getTopic();
|
||||||
final QOSType qos = evt.getQos();
|
final QOSType qos = evt.getQos();
|
||||||
|
|||||||
@@ -99,15 +99,7 @@ public class MQTTHandler extends IoHandlerAdapter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void handlePublish(IoSession session, PublishMessage message) {
|
protected void handlePublish(IoSession session, PublishMessage message) {
|
||||||
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
|
m_messaging.handleProtocolMessage(session, message);
|
||||||
|
|
||||||
if (message.getQos() == QOSType.MOST_ONE) {
|
|
||||||
m_messaging.publish(message.getTopicName(), message.getPayload(),
|
|
||||||
message.getQos(), message.isRetainFlag(), clientID, session);
|
|
||||||
} else {
|
|
||||||
m_messaging.publish(message.getTopicName(), message.getPayload(),
|
|
||||||
message.getQos(), message.isRetainFlag(), clientID, message.getMessageID(), session);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void handleDisconnect(IoSession session, DisconnectMessage disconnectMessage) {
|
protected void handleDisconnect(IoSession session, DisconnectMessage disconnectMessage) {
|
||||||
|
|||||||
Reference in New Issue
Block a user