diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index e40adb5059..4311a3ee69 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -735,7 +735,6 @@ void DomainServer::setupNodeListAndAssignments() { _assetClientThread.setObjectName("AssetClient Thread"); auto assetClient = DependencyManager::set(); assetClient->moveToThread(&_assetClientThread); - QObject::connect(&_assetClientThread, &QThread::started, assetClient.data(), &AssetClient::init); _assetClientThread.start(); // add whatever static assignments that have been parsed to the queue diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp index 41d988eca4..0a5c2c46c6 100644 --- a/libraries/networking/src/AssetClient.cpp +++ b/libraries/networking/src/AssetClient.cpp @@ -53,7 +53,7 @@ AssetClient::AssetClient() { this, &AssetClient::handleNodeClientConnectionReset); } -void AssetClient::init() { +void AssetClient::initCaching() { Q_ASSERT(QThread::currentThread() == thread()); // Setup disk cache if not already diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h index 3ec96c3dd4..1860a1744a 100644 --- a/libraries/networking/src/AssetClient.h +++ b/libraries/networking/src/AssetClient.h @@ -64,7 +64,7 @@ public: Q_INVOKABLE AssetUpload* createUpload(const QByteArray& data); public slots: - void init(); + void initCaching(); void cacheInfoRequest(QObject* reciever, QString slot); MiniPromise::Promise cacheInfoRequestAsync(MiniPromise::Promise deferred = nullptr); diff --git a/libraries/networking/src/AssetUtils.cpp b/libraries/networking/src/AssetUtils.cpp index 117274eab8..d302c6fac6 100644 --- a/libraries/networking/src/AssetUtils.cpp +++ b/libraries/networking/src/AssetUtils.cpp @@ -72,9 +72,8 @@ QByteArray loadFromCache(const QUrl& url) { qCDebug(asset_client) << url.toDisplayString() << "not in disk cache"; } - } else { - qCWarning(asset_client) << "No disk cache to load assets from."; } + return QByteArray(); } @@ -96,9 +95,8 @@ bool saveToCache(const QUrl& url, const QByteArray& file) { } qCWarning(asset_client) << "Could not save" << url.toDisplayString() << "to disk cache."; } - } else { - qCWarning(asset_client) << "No disk cache to save assets to."; } + return false; } diff --git a/libraries/networking/src/BaseAssetScriptingInterface.cpp b/libraries/networking/src/BaseAssetScriptingInterface.cpp index 3149bbc768..decb796fa4 100644 --- a/libraries/networking/src/BaseAssetScriptingInterface.cpp +++ b/libraries/networking/src/BaseAssetScriptingInterface.cpp @@ -47,7 +47,7 @@ bool BaseAssetScriptingInterface::initializeCache() { } // attempt to initialize the cache - QMetaObject::invokeMethod(assetClient().data(), "init"); + QMetaObject::invokeMethod(assetClient().data(), "initCaching"); Promise deferred = makePromise("BaseAssetScriptingInterface--queryCacheStatus"); deferred->then([this](QVariantMap result) { diff --git a/libraries/networking/src/ResourceManager.cpp b/libraries/networking/src/ResourceManager.cpp index 17dcd9728d..317cabdc61 100644 --- a/libraries/networking/src/ResourceManager.cpp +++ b/libraries/networking/src/ResourceManager.cpp @@ -31,7 +31,7 @@ ResourceManager::ResourceManager() { auto assetClient = DependencyManager::set(); assetClient->moveToThread(&_thread); - QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init); + QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::initCaching); _thread.start(); } diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp index 1623cf01cd..dbc2ad53f6 100644 --- a/tools/atp-client/src/ATPClientApp.cpp +++ b/tools/atp-client/src/ATPClientApp.cpp @@ -197,7 +197,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) : } auto assetClient = DependencyManager::set(); - assetClient->init(); + assetClient->initCaching(); if (_verbose) { qDebug() << "domain-server address is" << _domainServerAddress;