anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved params out of publishQos2

Browse Source
This commit is contained in:
andsel
2016-12-13 23:43:02 +01:00
parent 2640a5354c
commit da94a6a014
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
+1 -7
View File
@@ -11,8 +11,6 @@ import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import static io.moquette.parser.proto.messages.AbstractMessage.QOSType.MOST_ONE;
class BestEffortMessageSender { class BestEffortMessageSender {
private static final Logger LOG = LoggerFactory.getLogger(BestEffortMessageSender.class); private static final Logger LOG = LoggerFactory.getLogger(BestEffortMessageSender.class);
@@ -22,12 +20,8 @@ class BestEffortMessageSender {
this.connectionDescriptors = connectionDescriptors; this.connectionDescriptors = connectionDescriptors;
} }
void publishQos0(ClientSession clientsession, String topic, ByteBuffer message) { void publishQos0(ClientSession clientsession, String topic, ByteBuffer message, PublishMessage pubMessage) {
String clientId = clientsession.clientID; String clientId = clientsession.clientID;
LOG.debug("publishQos0 invoked clientId <{}> on topic <{}>", clientId, topic);
PublishMessage pubMessage = createPublishForQos(topic, MOST_ONE, message);
LOG.info("send publish message to <{}> on topic <{}>", clientId, topic); LOG.info("send publish message to <{}> on topic <{}>", clientId, topic);
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("content <{}>", DebugUtils.payload2Str(message)); LOG.debug("content <{}>", DebugUtils.payload2Str(message));
broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+9 -2
View File
@@ -1,6 +1,7 @@
package io.moquette.spi.impl; package io.moquette.spi.impl;
import io.moquette.parser.proto.messages.AbstractMessage; import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.server.ConnectionDescriptor; import io.moquette.server.ConnectionDescriptor;
import io.moquette.spi.ClientSession; import io.moquette.spi.ClientSession;
import io.moquette.spi.IMessagesStore; import io.moquette.spi.IMessagesStore;
@@ -14,6 +15,8 @@ import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import static io.moquette.parser.proto.messages.AbstractMessage.QOSType.MOST_ONE;
import static io.moquette.spi.impl.BestEffortMessageSender.createPublishForQos;
import static io.moquette.spi.impl.ProtocolProcessor.lowerQosToTheSubscriptionDesired; import static io.moquette.spi.impl.ProtocolProcessor.lowerQosToTheSubscriptionDesired;
class MessagesPublisher { class MessagesPublisher {
@@ -58,12 +61,16 @@ class MessagesPublisher {
if (targetIsActive) { if (targetIsActive) {
//QoS 0 //QoS 0
if (qos == AbstractMessage.QOSType.MOST_ONE) { if (qos == AbstractMessage.QOSType.MOST_ONE) {
this.bestEffortSender.publishQos0(targetSession, topic, message); PublishMessage publishMsg = BestEffortMessageSender.createPublishForQos(topic, MOST_ONE, message);
this.bestEffortSender.publishQos0(targetSession, topic, message, publishMsg);
} else { } else {
//QoS 1 or 2 //QoS 1 or 2
int messageId = targetSession.nextPacketId(); int messageId = targetSession.nextPacketId();
targetSession.inFlightAckWaiting(guid, messageId); targetSession.inFlightAckWaiting(guid, messageId);
this.persistentSender.publishQos2(targetSession, topic, qos, message, messageId); PublishMessage publishMsg = createPublishForQos(topic, qos, message);
//set the PacketIdentifier only for QoS > 0
publishMsg.setMessageID(messageId);
this.persistentSender.publishQos2(targetSession, publishMsg);
} }
} else { } else {
if (!targetSession.isCleanSession()) { if (!targetSession.isCleanSession()) {
broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java
+4 -11
View File
@@ -11,8 +11,6 @@ import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import static io.moquette.spi.impl.BestEffortMessageSender.createPublishForQos;
class PersistentQueueMessageSender { class PersistentQueueMessageSender {
private static final Logger LOG = LoggerFactory.getLogger(PersistentQueueMessageSender.class); private static final Logger LOG = LoggerFactory.getLogger(PersistentQueueMessageSender.class);
@@ -22,19 +20,14 @@ class PersistentQueueMessageSender {
this.connectionDescriptors = connectionDescriptors; this.connectionDescriptors = connectionDescriptors;
} }
void publishQos2(ClientSession clientsession, String topic, AbstractMessage.QOSType qos, void publishQos2(ClientSession clientsession, PublishMessage pubMessage) {
ByteBuffer message, int messageID) {
String clientId = clientsession.clientID; String clientId = clientsession.clientID;
LOG.debug("directSend invoked clientId <{}> on topic <{}> QoS {} retained {} messageID {}", LOG.debug("directSend invoked clientId <{}> on topic <{}> QoS {} retained {} messageID {}",
clientId, topic, qos, false, messageID); clientId, pubMessage.getTopicName(), pubMessage.getQos(), false, pubMessage.getMessageID());
PublishMessage pubMessage = createPublishForQos(topic, qos, message);
//set the PacketIdentifier only for QoS > 0 LOG.info("send publish message to <{}> on topic <{}>", clientId, pubMessage.getTopicName());
pubMessage.setMessageID(messageID);
LOG.info("send publish message to <{}> on topic <{}>", clientId, topic);
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("content <{}>", DebugUtils.payload2Str(message)); LOG.debug("content <{}>", DebugUtils.payload2Str(pubMessage.getPayload()));
} }
if (connectionDescriptors == null) { if (connectionDescriptors == null) {