Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 10:32:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CR round 3

Browse source
This commit is contained in:
Zach Fox 2018-11-08 10:41:31 -08:00
parent e0ca535853
commit 811b01816b
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/assets/ATPAssetMigrator.cpp
View file

@ -209,7 +209,7 @@ void ATPAssetMigrator::migrateResource(ResourceRequest* request) {
// add this URL to our hash of AssetUpload to original URL
_originalURLs.insert(upload, request->getUrl());
qCDebug(asset_migrator) << "Starting upload of asset";
qCDebug(asset_migrator) << "Starting upload of asset from" << request->getUrl();
// connect to the finished signal so we know when the AssetUpload is done
QObject::connect(upload, &AssetUpload::finished, this, &ATPAssetMigrator::assetUploadFinished);

4
libraries/networking/src/AssetUpload.cpp
View file

@ -76,6 +76,10 @@ void AssetUpload::start() {
// ask the AssetClient to upload the asset and emit the proper signals from the passed callback
auto assetClient = DependencyManager::get<AssetClient>();
if (!_filename.isEmpty()) {
qCDebug(asset_client) << "Attempting to upload" << _filename << "to asset-server.";
}
assetClient->uploadAsset(_data, [this](bool responseReceived, AssetUtils::AssetServerError error, const QString& hash){
if (!responseReceived) {

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

@ -765,7 +765,7 @@ bool Resource::handleFailedRequest(ResourceRequest::Result result) {
bool willRetry = false;
switch (result) {
case ResourceRequest::Result::Timeout: {
qCDebug(networking) << "Timed out, received" << _bytesReceived << "total" << _bytesTotal;
qCDebug(networking) << "Timed out loading" << _url.fileName() << "received" << _bytesReceived << "total" << _bytesTotal;
// Fall through to other cases
}
// FALLTHRU

4
scripts/developer/tests/unit_tests/moduleTests/entity/entityPreloadAPIError.js
View file

@ -2,12 +2,12 @@
// test module method exception being thrown within preload
(function() {
var apiMethod = Script.require('../exceptions/exceptionInFunction.js');
print("apiMethod", apiMethod);
print(Script.resolvePath(''), "apiMethod", apiMethod);
return {
preload: function(uuid) {
// this next line throws from within apiMethod
print(apiMethod());
print("entityPreloadAPIException::preload -- never seen --", uuid);
print("entityPreloadAPIException::preload -- never seen --", uuid, Script.resolvePath(''));
},
};
});