Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12457 from birarda/feat/disable-ds-asset-client-caching

Browse source 
disable caching for asset requests in domain-server
This commit is contained in:
Stephen Birarda 2018-02-21 18:16:56 -07:00 committed by GitHub
commit 3f9ee4918e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
domain-server/src/DomainServer.cpp
View file

@ -735,7 +735,6 @@ void DomainServer::setupNodeListAndAssignments() {
_assetClientThread.setObjectName("AssetClient Thread"); _assetClientThread.setObjectName("AssetClient Thread");
auto assetClient = DependencyManager::set<AssetClient>(); auto assetClient = DependencyManager::set<AssetClient>();
assetClient->moveToThread(&_assetClientThread); assetClient->moveToThread(&_assetClientThread);
QObject::connect(&_assetClientThread, &QThread::started, assetClient.data(), &AssetClient::init);
_assetClientThread.start(); _assetClientThread.start();
// add whatever static assignments that have been parsed to the queue // add whatever static assignments that have been parsed to the queue

2
libraries/networking/src/AssetClient.cpp
View file

@ -53,7 +53,7 @@ AssetClient::AssetClient() {
this, &AssetClient::handleNodeClientConnectionReset); this, &AssetClient::handleNodeClientConnectionReset);
} }
void AssetClient::init() { void AssetClient::initCaching() {
Q_ASSERT(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
// Setup disk cache if not already // Setup disk cache if not already

2
libraries/networking/src/AssetClient.h
View file

@ -64,7 +64,7 @@ public:
Q_INVOKABLE AssetUpload* createUpload(const QByteArray& data); Q_INVOKABLE AssetUpload* createUpload(const QByteArray& data);
public slots: public slots:
void init(); void initCaching();
void cacheInfoRequest(QObject* reciever, QString slot); void cacheInfoRequest(QObject* reciever, QString slot);
MiniPromise::Promise cacheInfoRequestAsync(MiniPromise::Promise deferred = nullptr); MiniPromise::Promise cacheInfoRequestAsync(MiniPromise::Promise deferred = nullptr);

6
libraries/networking/src/AssetUtils.cpp
View file

@ -72,9 +72,8 @@ QByteArray loadFromCache(const QUrl& url) {
qCDebug(asset_client) << url.toDisplayString() << "not in disk cache"; qCDebug(asset_client) << url.toDisplayString() << "not in disk cache";
} }
} else {
qCWarning(asset_client) << "No disk cache to load assets from.";
} }
return QByteArray(); 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."; qCWarning(asset_client) << "Could not save" << url.toDisplayString() << "to disk cache.";
} }
} else {
qCWarning(asset_client) << "No disk cache to save assets to.";
} }
return false; return false;
} }

2
libraries/networking/src/BaseAssetScriptingInterface.cpp
View file

@ -47,7 +47,7 @@ bool BaseAssetScriptingInterface::initializeCache() {
} }
// attempt to initialize the cache // attempt to initialize the cache
QMetaObject::invokeMethod(assetClient().data(), "init"); QMetaObject::invokeMethod(assetClient().data(), "initCaching");
Promise deferred = makePromise("BaseAssetScriptingInterface--queryCacheStatus"); Promise deferred = makePromise("BaseAssetScriptingInterface--queryCacheStatus");
deferred->then([this](QVariantMap result) { deferred->then([this](QVariantMap result) {

2
libraries/networking/src/ResourceManager.cpp
View file

@ -31,7 +31,7 @@ ResourceManager::ResourceManager() {
auto assetClient = DependencyManager::set<AssetClient>(); auto assetClient = DependencyManager::set<AssetClient>();
assetClient->moveToThread(&_thread); assetClient->moveToThread(&_thread);
QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init); QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::initCaching);
_thread.start(); _thread.start();
} }

2
tools/atp-client/src/ATPClientApp.cpp
View file

@ -197,7 +197,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
} }
auto assetClient = DependencyManager::set<AssetClient>(); auto assetClient = DependencyManager::set<AssetClient>();
assetClient->init(); assetClient->initCaching();
if (_verbose) { if (_verbose) {
qDebug() << "domain-server address is" << _domainServerAddress; qDebug() << "domain-server address is" << _domainServerAddress;