ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cache assets even in cases where the upload fails. That helps in asset upload debugging because the asset can be examined

Browse Source
This commit is contained in:
Melanie
2019-09-04 11:01:27 +01:00
parent bfc1756fe3
commit 3d019323e8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@@ -539,11 +539,11 @@ namespace OpenSim.Services.Connectors
// SynchronousRestObjectRequester returns somethins that is not an empty string
asset.ID = newID;
if (m_Cache != null)
m_Cache.Cache(asset);
}
}
if (m_Cache != null)
m_Cache.Cache(asset);
return asset.ID;
}
@@ -573,8 +573,8 @@ namespace OpenSim.Services.Connectors
if (newID == null || newID == String.Empty || newID == stringUUIDZero)
{
if(nextRetryLevel >= MAXSENDRETRIESLEN)
m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}",
asset.ID.ToString(), asset.Type.ToString());
m_log.WarnFormat("[Assets] Giving up on uploading after {2} retries id: {0} type {1}",
asset.ID.ToString(), asset.Type.ToString(), MAXSENDRETRIESLEN);
else
{
lock(m_sendRetries)
@@ -596,11 +596,11 @@ namespace OpenSim.Services.Connectors
if (newID != asset.ID)
{
asset.ID = newID;
if (m_Cache != null)
m_Cache.Cache(asset);
}
}
if (m_Cache != null)
m_Cache.Cache(asset);
}
public bool UpdateContent(string id, byte[] data)