OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Better error handling if Load OAR or Save OAR fail" 

This reverts commit 65c88b2ff4.

Yet again I accidentally committed something whilst evaluating it.
0.7.4.1
Justin Clark-Casey (justincc) 2012-05-07 20:01:17 +01:00
parent 15844da3af
commit 5d1d47e1f9
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -200,8 +200,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error( m_log.ErrorFormat(
String.Format("[ARCHIVER]: Aborting load with error in archive file {0} ", filePath), e); "[ARCHIVER]: Aborting load with error in archive file {0}. {1}", filePath, e);
m_errorMessage += e.ToString(); m_errorMessage += e.ToString();
m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage);
return; return;
@ -219,7 +219,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{ {
m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores);
m_errorMessage += String.Format("Failed to load {0} assets", failedAssetRestores); m_errorMessage += String.Format("Failed to load {0} assets", failedAssetRestores);
// Continue, because we allow the OAR to be loaded even if some assets fail
} }
} }
@ -229,19 +228,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_scene.DeleteAllSceneObjects(); m_scene.DeleteAllSceneObjects();
} }
try LoadParcels(serialisedParcels);
{ LoadObjects(serialisedSceneObjects);
LoadParcels(serialisedParcels);
LoadObjects(serialisedSceneObjects);
}
catch (Exception e)
{
m_log.Error("[ARCHIVER]: Error loading parcels or objects ", e);
m_errorMessage += e.ToString();
m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage);
return;
}
m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");

5
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
View File

@ -87,11 +87,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{ {
Save(assetsFoundUuids, assetsNotFoundUuids); Save(assetsFoundUuids, assetsNotFoundUuids);
} }
catch (Exception e)
{
m_scene.EventManager.TriggerOarFileSaved(m_requestId, e.ToString());
throw;
}
finally finally
{ {
m_archiveWriter.Close(); m_archiveWriter.Close();

11
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -124,9 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (options.ContainsKey("noassets") && (bool)options["noassets"]) if (options.ContainsKey("noassets") && (bool)options["noassets"])
SaveAssets = false; SaveAssets = false;
// Whether someone else (i.e., ReceivedAllAssets()) is responsible for calling TriggerOarFileSaved() when we're done
bool eventHandled = false;
try try
{ {
Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>(); Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
@ -233,21 +230,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets); m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets);
Util.FireAndForget(o => ar.Execute()); Util.FireAndForget(o => ar.Execute());
eventHandled = true;
} }
else else
{ {
awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>()); awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>());
eventHandled = true;
} }
} }
catch (Exception e) catch (Exception)
{ {
m_saveStream.Close(); m_saveStream.Close();
if (!eventHandled)
m_scene.EventManager.TriggerOarFileSaved(m_requestId, e.ToString());
throw; throw;
} }
} }