From 7441e20f5842ab2b7d1fe8ff175a05feafd41d5d Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri, 20 Nov 2015 11:20:36 -0800
Subject: [PATCH] cleanup

---
 .../src/messages/MessagesMixer.cpp            | 39 ++++++-------------
 .../src/messages/MessagesMixer.h              |  1 -
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/assignment-client/src/messages/MessagesMixer.cpp b/assignment-client/src/messages/MessagesMixer.cpp
index 684c5f262c..8f2b8a5475 100644
--- a/assignment-client/src/messages/MessagesMixer.cpp
+++ b/assignment-client/src/messages/MessagesMixer.cpp
@@ -12,18 +12,15 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QJsonObject>
 #include <QBuffer>
-
 #include <LogHandler.h>
 #include <MessagesClient.h>
 #include <NodeList.h>
 #include <udt/PacketHeaders.h>
-
 #include "MessagesMixer.h"
 
 const QString MESSAGES_MIXER_LOGGING_NAME = "messages-mixer";
 
-MessagesMixer::MessagesMixer(NLPacket& packet) :
-    ThreadedAssignment(packet)
+MessagesMixer::MessagesMixer(NLPacket& packet) : ThreadedAssignment(packet)
 {
     connect(DependencyManager::get<NodeList>().data(), &NodeList::nodeKilled, this, &MessagesMixer::nodeKilled);
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
@@ -32,9 +29,6 @@ MessagesMixer::MessagesMixer(NLPacket& packet) :
     packetReceiver.registerMessageListener(PacketType::MessagesUnsubscribe, this, "handleMessagesUnsubscribe");
 }
 
-MessagesMixer::~MessagesMixer() {
-}
-
 void MessagesMixer::nodeKilled(SharedNodePointer killedNode) {
     for (auto& channel : _channelSubscribers) {
         channel.remove(killedNode->getUUID());
@@ -42,8 +36,6 @@ void MessagesMixer::nodeKilled(SharedNodePointer killedNode) {
 }
 
 void MessagesMixer::handleMessages(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) {
-    Q_ASSERT(packetList->getType() == PacketType::MessagesData);
-
     QString channel, message;
     QUuid senderID;
     MessagesClient::decodeMessagesPacket(packetList, channel, message, senderID);
@@ -62,43 +54,34 @@ void MessagesMixer::handleMessages(QSharedPointer<NLPacketList> packetList, Shar
 }
 
 void MessagesMixer::handleMessagesSubscribe(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) {
-    Q_ASSERT(packetList->getType() == PacketType::MessagesSubscribe);
     QString channel = QString::fromUtf8(packetList->getMessage());
-    qDebug() << "Node [" << senderNode->getUUID() << "] subscribed to channel:" << channel;
     _channelSubscribers[channel] << senderNode->getUUID();
 }
 
 void MessagesMixer::handleMessagesUnsubscribe(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) {
-    Q_ASSERT(packetList->getType() == PacketType::MessagesUnsubscribe);
     QString channel = QString::fromUtf8(packetList->getMessage());
-    qDebug() << "Node [" << senderNode->getUUID() << "] unsubscribed from channel:" << channel;
-
     if (_channelSubscribers.contains(channel)) {
         _channelSubscribers[channel].remove(senderNode->getUUID());
     }
 }
 
-// FIXME - make these stats relevant
 void MessagesMixer::sendStatsPacket() {
-    QJsonObject statsObject;
-    QJsonObject messagesObject;
-    auto nodeList = DependencyManager::get<NodeList>();
+    QJsonObject statsObject, messagesMixerObject;
 
     // add stats for each listerner
-    nodeList->eachNode([&](const SharedNodePointer& node) {
-        QJsonObject messagesStats;
-        messagesStats[USERNAME_UUID_REPLACEMENT_STATS_KEY] = uuidStringWithoutCurlyBraces(node->getUUID());
-        messagesStats["outbound_kbps"] = node->getOutboundBandwidth();
-        messagesStats["inbound_kbps"] = node->getInboundBandwidth();
-        messagesObject[uuidStringWithoutCurlyBraces(node->getUUID())] = messagesStats;
+    DependencyManager::get<NodeList>()->eachNode([&](const SharedNodePointer& node) {
+        QJsonObject clientStats;
+        clientStats[USERNAME_UUID_REPLACEMENT_STATS_KEY] = uuidStringWithoutCurlyBraces(node->getUUID());
+        clientStats["outbound_kbps"] = node->getOutboundBandwidth();
+        clientStats["inbound_kbps"] = node->getInboundBandwidth();
+        messagesMixerObject[uuidStringWithoutCurlyBraces(node->getUUID())] = clientStats;
     });
 
-    statsObject["messages"] = messagesObject;
+    statsObject["messages"] = messagesMixerObject;
     ThreadedAssignment::addPacketStatsAndSendStatsPacket(statsObject);
 }
 
 void MessagesMixer::run() {
     ThreadedAssignment::commonInit(MESSAGES_MIXER_LOGGING_NAME, NodeType::MessagesMixer);
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->addNodeTypeToInterestSet(NodeType::Agent);
-}
+    DependencyManager::get<NodeList>()->addNodeTypeToInterestSet(NodeType::Agent);
+}
\ No newline at end of file
diff --git a/assignment-client/src/messages/MessagesMixer.h b/assignment-client/src/messages/MessagesMixer.h
index 65419a8ca6..cf5fc79e17 100644
--- a/assignment-client/src/messages/MessagesMixer.h
+++ b/assignment-client/src/messages/MessagesMixer.h
@@ -22,7 +22,6 @@ class MessagesMixer : public ThreadedAssignment {
     Q_OBJECT
 public:
     MessagesMixer(NLPacket& packet);
-    ~MessagesMixer();
 
 public slots:
     void run();