diff options
author | onefang | 2020-09-09 04:33:43 +1000 |
---|---|---|
committer | onefang | 2020-09-09 04:33:43 +1000 |
commit | 0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d (patch) | |
tree | 2abffa5e6450eb654f1aa21f9ed46d5cf7a4d7c1 /OpenSim/Region/Framework | |
parent | Update version number stuff, and hack it into the money display. (diff) | |
download | opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.zip opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.tar.gz opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.tar.bz2 opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.tar.xz |
Various logging fix ups.
Mostly removing console spam.
Swap a bunch of info / debug logs.
Better archiver console spam.
Have some "avatar has left" mesasge hit the INFO console.
Tweak the login logging a bit, especially for impersonations.
Default to INFO on the console and DEBUG in the log files.
More time stamp resolution.
Better sim startup console notification.
Attempt to render "[LLUDPSERVER]: Malformed data, cannot parse" into
something human readable as an aid to diagnosis. Beats hand translating
the big block of hex codes it was spewing.
Better sim startup finished messages. Inform neighbours we are up
before the finished messages. Always send the "[RegionReady]:
INITIALIZATION COMPLETE FOR" message.
Diffstat (limited to 'OpenSim/Region/Framework')
6 files changed, 36 insertions, 28 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index debcad3..4185813 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 | |||
1691 | UUID copyID = UUID.Random(); | 1691 | UUID copyID = UUID.Random(); |
1692 | bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); | 1692 | bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); |
1693 | part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); | 1693 | part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); |
1694 | m_log.InfoFormat( | 1694 | //// m_log.InfoFormat( |
1695 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", | 1695 | //// "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", |
1696 | item.Name, primLocalID, remoteClient.Name); | 1696 | //// item.Name, primLocalID, remoteClient.Name); |
1697 | part.SendPropertiesToClient(remoteClient); | 1697 | part.SendPropertiesToClient(remoteClient); |
1698 | if (!Permissions.BypassPermissions()) | 1698 | if (!Permissions.BypassPermissions()) |
1699 | { | 1699 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0c5007a..5f1497a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1770,15 +1770,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
1770 | GC.Collect(); | 1770 | GC.Collect(); |
1771 | if (!LoginLock) | 1771 | if (!LoginLock) |
1772 | { | 1772 | { |
1773 | m_sceneGridService.InformNeighborsThatRegionisUp( | ||
1774 | RequestModuleInterface<INeighbourService>(), RegionInfo); | ||
1775 | |||
1773 | if (!StartDisabled) | 1776 | if (!StartDisabled) |
1774 | { | 1777 | { |
1775 | m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | 1778 | m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
1776 | LoginsEnabled = true; | 1779 | LoginsEnabled = true; |
1777 | } | 1780 | } |
1778 | 1781 | ||
1779 | m_sceneGridService.InformNeighborsThatRegionisUp( | ||
1780 | RequestModuleInterface<INeighbourService>(), RegionInfo); | ||
1781 | |||
1782 | // Region ready should always be set | 1782 | // Region ready should always be set |
1783 | Ready = true; | 1783 | Ready = true; |
1784 | 1784 | ||
@@ -1805,7 +1805,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1805 | } | 1805 | } |
1806 | } | 1806 | } |
1807 | } | 1807 | } |
1808 | else | 1808 | //// else |
1809 | { | 1809 | { |
1810 | // This handles a case of a region having no scripts for the RegionReady module | 1810 | // This handles a case of a region having no scripts for the RegionReady module |
1811 | if (m_sceneGraph.GetActiveScriptsCount() == 0) | 1811 | if (m_sceneGraph.GetActiveScriptsCount() == 0) |
@@ -3716,7 +3716,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3716 | { | 3716 | { |
3717 | isChildAgent = avatar.IsChildAgent; | 3717 | isChildAgent = avatar.IsChildAgent; |
3718 | 3718 | ||
3719 | m_log.DebugFormat( | 3719 | m_log.InfoFormat( |
3720 | "[SCENE]: Removing {0} agent {1} {2} from {3}", | 3720 | "[SCENE]: Removing {0} agent {1} {2} from {3}", |
3721 | isChildAgent ? "child" : "root", avatar.Name, agentID, Name); | 3721 | isChildAgent ? "child" : "root", avatar.Name, agentID, Name); |
3722 | 3722 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c89a123..fdfa1e9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
88 | 88 | ||
89 | if (neighbour != null) | 89 | if (neighbour != null) |
90 | { | 90 | { |
91 | m_log.DebugFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up", | 91 | m_log.InfoFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up", |
92 | LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y)); | 92 | LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y)); |
93 | 93 | ||
94 | m_scene.EventManager.TriggerOnRegionUp(neighbour); | 94 | m_scene.EventManager.TriggerOnRegionUp(neighbour); |
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
134 | m_log.DebugFormat( | 134 | m_log.InfoFormat( |
135 | "{0} Informing {1} neighbours that region {2} is up", | 135 | "{0} Informing {1} neighbours that region {2} is up", |
136 | LogHeader, onlineNeighbours.Count, m_scene.Name); | 136 | LogHeader, onlineNeighbours.Count, m_scene.Name); |
137 | 137 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 41f3ef4..5302e8b 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -176,10 +176,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
176 | i++; | 176 | i++; |
177 | } | 177 | } |
178 | } | 178 | } |
179 | catch (Exception e) | 179 | catch /*(Exception e)*/ |
180 | { | 180 | { |
181 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); | 181 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); |
182 | Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); | 182 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); |
183 | //// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); | ||
183 | return false; | 184 | return false; |
184 | } | 185 | } |
185 | 186 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index ae8f6f6..d9a1f93 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -69,10 +69,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
69 | { | 69 | { |
70 | return FromOriginalXmlFormat(reader); | 70 | return FromOriginalXmlFormat(reader); |
71 | } | 71 | } |
72 | catch (Exception e) | 72 | catch /*(Exception e)*/ |
73 | { | 73 | { |
74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
75 | Util.LogFailedXML("[SERIALIZER]:", fixedData); | 75 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
76 | //// Util.LogFailedXML("[SERIALIZER]:", fixedData); | ||
76 | return null; | 77 | return null; |
77 | } | 78 | } |
78 | } | 79 | } |
@@ -307,10 +308,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
307 | // sceneObject.AggregatePerms(); | 308 | // sceneObject.AggregatePerms(); |
308 | return sceneObject; | 309 | return sceneObject; |
309 | } | 310 | } |
310 | catch (Exception e) | 311 | catch /*(Exception e)*/ |
311 | { | 312 | { |
312 | m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 313 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
313 | Util.LogFailedXML("[SERIALIZER]:", xmlData); | 314 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
315 | //// Util.LogFailedXML("[SERIALIZER]:", xmlData); | ||
314 | return null; | 316 | return null; |
315 | } | 317 | } |
316 | } | 318 | } |
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index d0c48b7..88a93b5 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -573,18 +573,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
573 | { | 573 | { |
574 | string xml = Utils.BytesToString(sceneObjectAsset.Data); | 574 | string xml = Utils.BytesToString(sceneObjectAsset.Data); |
575 | 575 | ||
576 | CoalescedSceneObjects coa; | 576 | if (String.IsNullOrEmpty(xml)) |
577 | if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) | 577 | m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID); |
578 | { | ||
579 | foreach (SceneObjectGroup sog in coa.Objects) | ||
580 | AddForInspection(sog); | ||
581 | } | ||
582 | else | 578 | else |
583 | { | 579 | { |
584 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | 580 | CoalescedSceneObjects coa; |
581 | if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) | ||
582 | { | ||
583 | foreach (SceneObjectGroup sog in coa.Objects) | ||
584 | AddForInspection(sog); | ||
585 | } | ||
586 | else | ||
587 | { | ||
588 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | ||
585 | 589 | ||
586 | if (null != sog) | 590 | if (null != sog) |
587 | AddForInspection(sog); | 591 | AddForInspection(sog); |
592 | } | ||
588 | } | 593 | } |
589 | } | 594 | } |
590 | 595 | ||