aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-08-05 00:49:17 +0100
committerJustin Clark-Casey (justincc)2014-08-05 00:51:17 +0100
commita4595b18cae04dd37546c2ae1cf3eea64599c9f4 (patch)
tree4aece76d243d6e2e3c42486a63285c1ea126551e /OpenSim/Region
parentAdd conflict resolution that should have been done in conflict resolution of ... (diff)
downloadopensim-SC_OLD-a4595b18cae04dd37546c2ae1cf3eea64599c9f4.zip
opensim-SC_OLD-a4595b18cae04dd37546c2ae1cf3eea64599c9f4.tar.gz
opensim-SC_OLD-a4595b18cae04dd37546c2ae1cf3eea64599c9f4.tar.bz2
opensim-SC_OLD-a4595b18cae04dd37546c2ae1cf3eea64599c9f4.tar.xz
Make currently unfiltered EventQueue log messages only appear now at DebugLevel 1
This covers event queue setup messages and some outgoing messages (e.g. EnableSimulator) In my experience these messages are only useful if you really know what they mean and you're looking for them Otherwise, they're quite spammy. Event queue DebugLevel 1 is enabled with the "debug eq 1" console command
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs40
1 files changed, 24 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index b162bb9..9b9f6a7 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack.Linden
101 "debug eq [0|1|2]", 101 "debug eq [0|1|2]",
102 "Turn on event queue debugging\n" 102 "Turn on event queue debugging\n"
103 + " <= 0 - turns off all event queue logging\n" 103 + " <= 0 - turns off all event queue logging\n"
104 + " >= 1 - turns on outgoing event logging\n" 104 + " >= 1 - turns on event queue setup and outgoing event logging\n"
105 + " >= 2 - turns on poll notification", 105 + " >= 2 - turns on poll notification",
106 HandleDebugEq); 106 HandleDebugEq);
107 107
@@ -188,9 +188,11 @@ namespace OpenSim.Region.ClientStack.Linden
188 { 188 {
189 if (!queues.ContainsKey(agentId)) 189 if (!queues.ContainsKey(agentId))
190 { 190 {
191 m_log.DebugFormat( 191 if (DebugLevel > 0)
192 "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 192 m_log.DebugFormat(
193 agentId, m_scene.RegionInfo.RegionName); 193 "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}",
194 agentId, m_scene.RegionInfo.RegionName);
195
194 queues[agentId] = new Queue<OSD>(); 196 queues[agentId] = new Queue<OSD>();
195 } 197 }
196 198
@@ -302,9 +304,10 @@ namespace OpenSim.Region.ClientStack.Linden
302 { 304 {
303 // Register an event queue for the client 305 // Register an event queue for the client
304 306
305 m_log.DebugFormat( 307 if (DebugLevel > 0)
306 "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}", 308 m_log.DebugFormat(
307 agentID, caps, m_scene.RegionInfo.RegionName); 309 "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
310 agentID, caps, m_scene.RegionInfo.RegionName);
308 311
309 // Let's instantiate a Queue for this agent right now 312 // Let's instantiate a Queue for this agent right now
310 TryGetQueue(agentID); 313 TryGetQueue(agentID);
@@ -720,8 +723,9 @@ namespace OpenSim.Region.ClientStack.Linden
720 723
721 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) 724 public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY)
722 { 725 {
723 m_log.DebugFormat("{0} EnableSimulator. handle={1}, avatarID={2}, regionSize={3},{4}>", 726 if (DebugLevel > 0)
724 LogHeader, handle, avatarID, regionSizeX, regionSizeY); 727 m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}",
728 LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY);
725 729
726 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY); 730 OSD item = EventQueueHelper.EnableSimulator(handle, endPoint, regionSizeX, regionSizeY);
727 Enqueue(item, avatarID); 731 Enqueue(item, avatarID);
@@ -730,8 +734,10 @@ namespace OpenSim.Region.ClientStack.Linden
730 public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath, 734 public virtual void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath,
731 ulong regionHandle, int regionSizeX, int regionSizeY) 735 ulong regionHandle, int regionSizeX, int regionSizeY)
732 { 736 {
733 m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, avatarID={2}, regionSize={3},{4}>", 737 if (DebugLevel > 0)
734 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY); 738 m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}",
739 LogHeader, regionHandle, endPoint, avatarID, regionSizeX, regionSizeY);
740
735 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY); 741 OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath, regionHandle, regionSizeX, regionSizeY);
736 Enqueue(item, avatarID); 742 Enqueue(item, avatarID);
737 } 743 }
@@ -741,8 +747,9 @@ namespace OpenSim.Region.ClientStack.Linden
741 uint locationID, uint flags, string capsURL, 747 uint locationID, uint flags, string capsURL,
742 UUID avatarID, int regionSizeX, int regionSizeY) 748 UUID avatarID, int regionSizeX, int regionSizeY)
743 { 749 {
744 m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, avatarID={2}, regionSize=<{3},{4}>", 750 if (DebugLevel > 0)
745 LogHeader, regionHandle, avatarID, regionSizeX, regionSizeY); 751 m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, endPoint={2}, avatarID={3}",
752 LogHeader, regionHandle, regionExternalEndPoint, avatarID, regionSizeX, regionSizeY);
746 753
747 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint, 754 OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
748 locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY); 755 locationID, flags, capsURL, avatarID, regionSizeX, regionSizeY);
@@ -753,8 +760,9 @@ namespace OpenSim.Region.ClientStack.Linden
753 IPEndPoint newRegionExternalEndPoint, 760 IPEndPoint newRegionExternalEndPoint,
754 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY) 761 string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY)
755 { 762 {
756 m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>", 763 if (DebugLevel > 0)
757 LogHeader, handle, avatarID, regionSizeX, regionSizeY); 764 m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>",
765 LogHeader, handle, avatarID, regionSizeX, regionSizeY);
758 766
759 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint, 767 OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
760 capsURL, avatarID, sessionID, regionSizeX, regionSizeY); 768 capsURL, avatarID, sessionID, regionSizeX, regionSizeY);
@@ -819,4 +827,4 @@ namespace OpenSim.Region.ClientStack.Linden
819 Enqueue(item, avatarID); 827 Enqueue(item, avatarID);
820 } 828 }
821 } 829 }
822} 830} \ No newline at end of file