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

* minor: remove load oar logging I accidentally left in a few commits ago 

* reduce noisiness of uuid gatherer
* stop bothering to pointless complain about directory tar entries when loading an oar
0.6.5-rc1
Justin Clarke Casey 2009-03-24 21:05:20 +00:00
parent 64341fc965
commit 6cad71d5ec
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,12 +110,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
//m_log.DebugFormat( //m_log.DebugFormat(
// "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length);
if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
{
m_log.WarnFormat(
"[ARCHIVER]: Ignoring directory entry {0}", filePath);
}
else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
{ {
serialisedSceneObjects.Add(m_asciiEncoding.GetString(data)); serialisedSceneObjects.Add(m_asciiEncoding.GetString(data));
} }
@ -172,18 +167,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
foreach (string serialisedSceneObject in serialisedSceneObjects) foreach (string serialisedSceneObject in serialisedSceneObjects)
{ {
/*
m_log.DebugFormat("[ARCHIVER]: Loading xml with raw size {0}", serialisedSceneObject.Length); m_log.DebugFormat("[ARCHIVER]: Loading xml with raw size {0}", serialisedSceneObject.Length);
// Really large xml files (multi megabyte) appear to cause // Really large xml files (multi megabyte) appear to cause
// memory problems // memory problems
// when loading the xml. But don't enable this check yet // when loading the xml. But don't enable this check yet
/*
if (serialisedSceneObject.Length > 5000000) if (serialisedSceneObject.Length > 5000000)
{ {
m_log.Error("[ARCHIVER]: Ignoring xml since size > 5000000);"); m_log.Error("[ARCHIVER]: Ignoring xml since size > 5000000);");
continue; continue;
} }
*/ */
SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject); SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);

4
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@ -110,8 +110,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="assetUuids">The assets gathered</param> /// <param name="assetUuids">The assets gathered</param>
public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, int> assetUuids) public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, int> assetUuids)
{ {
m_log.DebugFormat( // m_log.DebugFormat(
"[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID); // "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
foreach (SceneObjectPart part in sceneObject.GetParts()) foreach (SceneObjectPart part in sceneObject.GetParts())
{ {