From 60ae1259fa7de0239eae1f5b8b8434e04c8158b4 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 17 Nov 2015 11:06:27 -0800 Subject: [PATCH] more cleanup work --- libraries/networking/src/MessagesClient.cpp | 21 ------------------- libraries/networking/src/MessagesClient.h | 2 -- libraries/networking/src/PacketReceiver.cpp | 4 +--- .../networking/src/ThreadedAssignment.cpp | 3 --- 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/libraries/networking/src/MessagesClient.cpp b/libraries/networking/src/MessagesClient.cpp index 9823a7130e..60f1146c92 100644 --- a/libraries/networking/src/MessagesClient.cpp +++ b/libraries/networking/src/MessagesClient.cpp @@ -14,18 +14,11 @@ #include #include -#include #include -#include -#include "AssetRequest.h" -#include "AssetUpload.h" -#include "AssetUtils.h" -#include "NetworkAccessManager.h" #include "NetworkLogging.h" #include "NodeList.h" #include "PacketReceiver.h" -#include "ResourceCache.h" MessagesClient::MessagesClient() { @@ -45,20 +38,6 @@ void MessagesClient::init() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "init", Qt::BlockingQueuedConnection); } - - // Setup disk cache if not already - QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); - if (!networkAccessManager.cache()) { - QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation); - cachePath = !cachePath.isEmpty() ? cachePath : "interfaceCache"; - - QNetworkDiskCache* cache = new QNetworkDiskCache(); - cache->setMaximumCacheSize(MAXIMUM_CACHE_SIZE); - cache->setCacheDirectory(cachePath); - networkAccessManager.setCache(cache); - qCDebug(asset_client) << "MessagesClient disk cache setup at" << cachePath - << "(size:" << MAXIMUM_CACHE_SIZE / BYTES_PER_GIGABYTES << "GB)"; - } } bool haveMessagesMixer() { diff --git a/libraries/networking/src/MessagesClient.h b/libraries/networking/src/MessagesClient.h index 2c699850f6..a79b855be9 100644 --- a/libraries/networking/src/MessagesClient.h +++ b/libraries/networking/src/MessagesClient.h @@ -35,8 +35,6 @@ public: private slots: void handleMessagesPacket(QSharedPointer packetList, SharedNodePointer senderNode); void handleNodeKilled(SharedNodePointer node); - -private: }; #endif diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp index 81d8c5ee73..0a3ea86399 100644 --- a/libraries/networking/src/PacketReceiver.cpp +++ b/libraries/networking/src/PacketReceiver.cpp @@ -95,8 +95,6 @@ void PacketReceiver::registerDirectListenerForTypes(PacketTypeList types, } bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener, const char* slot) { - qCDebug(networking) << "PacketReceiver::registerMessageListener() packet list type" << type; - Q_ASSERT_X(listener, "PacketReceiver::registerMessageListener", "No object to register"); Q_ASSERT_X(slot, "PacketReceiver::registerMessageListener", "No slot to register"); @@ -117,7 +115,7 @@ bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener, return true; } else { - qCDebug(networking) << "NOT Registering a packet listener for packet list type" << type; + qCWarning(networking) << "FAILED to Register a packet listener for packet list type" << type; return false; } } diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index b204982896..6855c2eec3 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -124,12 +124,9 @@ void ThreadedAssignment::stopSendingStats() { } void ThreadedAssignment::checkInWithDomainServerOrExit() { - qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit()...."; if (DependencyManager::get()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) { - qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit().... getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS"; setFinished(true); } else { - qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit().... calling DependencyManager::get()->sendDomainServerCheckIn()"; DependencyManager::get()->sendDomainServerCheckIn(); } }