From 7695c14598a09a6673cca7f8cae0392e9707aca0 Mon Sep 17 00:00:00 2001
From: andrea <andrea@samarcanda>
Date: Thu, 26 Dec 2013 12:48:35 +0100
Subject: [PATCH] Minor change added logging

---
 .../moquette/messaging/spi/impl/HawtDBStorageService.java   | 6 ++++++
 .../mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java | 4 +++-
 .../spi/impl/subscriptions/SubscriptionsStore.java          | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
index c2df8cb1..6af5505e 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
@@ -216,14 +216,18 @@ public class HawtDBStorageService implements IStorageService {
     }
 
     public void addNewSubscription(Subscription newSubscription, String clientID) {
+        LOG.debug("addNewSubscription invoked with subscription {} for client {}", newSubscription, clientID);
         if (!m_persistentSubscriptions.containsKey(clientID)) {
+            LOG.debug("clientID {} is a newcome, creating it's subscriptions set", clientID);
             m_persistentSubscriptions.put(clientID, new HashSet<Subscription>());
         }
 
         Set<Subscription> subs = m_persistentSubscriptions.get(clientID);
         if (!subs.contains(newSubscription)) {
+            LOG.debug("updating clientID {} subscriptions set with new subscription", clientID);
             subs.add(newSubscription);
             m_persistentSubscriptions.put(clientID, subs);
+            LOG.debug("clientID {} subscriptions set now is {}", clientID, subs);
         }
     }
 
@@ -236,10 +240,12 @@ public class HawtDBStorageService implements IStorageService {
         for (Map.Entry<String, Set<Subscription>> entry : m_persistentSubscriptions) {
             allSubscriptions.addAll(entry.getValue());
         }
+        LOG.debug("retrieveAllSubscriptions returning subs {}", allSubscriptions);
         return allSubscriptions;
     }
 
     public void close() {
+        LOG.debug("closing disk storage");
         try {
             pageFactory.close();
         } catch (IOException ex) {
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java
index e2822cf6..c93396e1 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java
@@ -236,7 +236,8 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
      * Flood the subscribers with the message to notify. MessageID is optional and should only used for QoS 1 and 2
      * */
     private void publish2Subscribers(String topic, AbstractMessage.QOSType qos, ByteBuffer message, boolean retain, Integer messageID) {
-        LOG.debug("publish2Subscribers republishing to existing subscribers that matches the topic {}", topic);
+        LOG.debug("publish2Subscribers republishing to existing subscribers that matches the topic {}, content", topic);
+        LOG.debug("content <{}>", new String(message.array()));
         if (LOG.isDebugEnabled()) {
             LOG.debug("subscription tree {}", subscriptions.dumpTree());
         }
@@ -281,6 +282,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
         pubMessage.setPayload(message);
         
         LOG.info("send publish message to <{}> on topic <{}>", clientId, topic);
+        LOG.debug("content <{}>", new String(message.array()));
         if (pubMessage.getQos() != AbstractMessage.QOSType.MOST_ONE) {
             pubMessage.setMessageID(messageID);
         }
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
index 240c7ccc..c92ce9f7 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
@@ -122,7 +122,6 @@ public class SubscriptionsStore {
         //log the subscription
         String clientID = newSubscription.getClientId();
         m_storageService.addNewSubscription(newSubscription, clientID);
-//        pageFile.flush();
     }