From 66d7ba733f296f81398a040f05dd945c2facb2b4 Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 22:25:06 +1000 Subject: Various logging fix ups. Mostly removing console spam. Default to INFO on the console and DEBUG in the log files. More time stamp resolution. --- OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | 5 ----- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 +++--- .../Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 5 +++-- .../Framework/Scenes/Serialization/SceneObjectSerializer.cs | 10 ++++++---- OpenSim/Services/FSAssetService/FSAssetService.cs | 2 +- OpenSim/Services/GridService/GridService.cs | 4 ++-- OpenSim/Services/PresenceService/PresenceService.cs | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 3092fe0..0a955c5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs @@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver asset.Data); m_assetsWritten++; - - //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten); - - if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0) - m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten); } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b3303a0..6e5ffde 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1691,9 +1691,9 @@ namespace OpenSim.Region.Framework.Scenes UUID copyID = UUID.Random(); bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); - m_log.InfoFormat( - "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", - item.Name, primLocalID, remoteClient.Name); +//// m_log.InfoFormat( +//// "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", +//// item.Name, primLocalID, remoteClient.Name); part.SendPropertiesToClient(remoteClient); if (!Permissions.BypassPermissions()) { diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index abcb573..4024fea 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs @@ -181,8 +181,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization } catch (Exception e) { - m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); - Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); + m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); +//// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); +//// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); return false; } diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c5a3a22..c2b075c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -71,8 +71,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization } catch (Exception e) { - m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); - Util.LogFailedXML("[SERIALIZER]:", fixedData); + m_log.Error("[SERIALIZER]: Deserialization of xml failed "); +//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); +//// Util.LogFailedXML("[SERIALIZER]:", fixedData); return null; } } @@ -315,8 +316,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization } catch (Exception e) { - m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); - Util.LogFailedXML("[SERIALIZER]:", xmlData); + m_log.Error("[SERIALIZER]: Deserialization of xml failed "); +//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); +//// Util.LogFailedXML("[SERIALIZER]:", xmlData); return null; } } diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index ca2f459..812d89d 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs @@ -231,7 +231,7 @@ namespace OpenSim.Services.FSAssetService double avg = (double)m_readTicks / (double)m_readCount; // if (avg > 10000) // Environment.Exit(0); - m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); +//// m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); } m_readCount = 0; m_readTicks = 0; diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index a5c7d34..2a2d8a8 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -345,7 +345,7 @@ namespace OpenSim.Services.GridService m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); } - m_log.DebugFormat + m_log.InfoFormat ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, regionInfos.RegionCoordX, regionInfos.RegionCoordY, @@ -374,7 +374,7 @@ namespace OpenSim.Services.GridService if (region == null) return false; - m_log.DebugFormat( + m_log.InfoFormat( "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}", region.RegionName, region.RegionID, region.coordX, region.coordY); diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index ae92919..0392409 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs @@ -88,7 +88,7 @@ namespace OpenSim.Services.PresenceService { PresenceInfo presence = GetAgent(sessionID); - m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", + m_log.InfoFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", sessionID, (presence == null) ? null : presence.UserID, (presence == null) ? null : presence.RegionID.ToString()); -- cgit v1.1