aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs36
1 files changed, 19 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 2bb36a3..a89b52c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Region.Environment.Scenes
40 40
41 public class SceneCommunicationService //one instance per region 41 public class SceneCommunicationService //one instance per region
42 { 42 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
44
43 protected CommunicationsManager m_commsProvider; 45 protected CommunicationsManager m_commsProvider;
44 protected RegionInfo m_regionInfo; 46 protected RegionInfo m_regionInfo;
45 47
@@ -77,7 +79,7 @@ namespace OpenSim.Region.Environment.Scenes
77 79
78 if (regionCommsHost != null) 80 if (regionCommsHost != null)
79 { 81 {
80 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString()); 82 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got" + regionCommsHost.ToString());
81 83
82 regionCommsHost.debugRegionName = _debugRegionName; 84 regionCommsHost.debugRegionName = _debugRegionName;
83 85
@@ -91,7 +93,7 @@ namespace OpenSim.Region.Environment.Scenes
91 } 93 }
92 else 94 else
93 { 95 {
94 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null"); 96 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
95 } 97 }
96 } 98 }
97 99
@@ -122,7 +124,7 @@ namespace OpenSim.Region.Environment.Scenes
122 { 124 {
123 if (OnExpectUser != null) 125 if (OnExpectUser != null)
124 { 126 {
125 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname); 127 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname);
126 OnExpectUser(regionHandle, agent); 128 OnExpectUser(regionHandle, agent);
127 } 129 }
128 } 130 }
@@ -131,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes
131 { 133 {
132 if (OnRegionUp != null) 134 if (OnRegionUp != null)
133 { 135 {
134 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName); 136 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName);
135 OnRegionUp(region); 137 OnRegionUp(region);
136 } 138 }
137 return true; 139 return true;
@@ -164,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes
164 166
165 protected bool CloseConnection(ulong regionHandle, LLUUID agentID) 167 protected bool CloseConnection(ulong regionHandle, LLUUID agentID)
166 { 168 {
167 MainLog.Instance.Verbose("INTERREGION", "Incoming Agent Close Request for agent: " + agentID.ToString()); 169 m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString());
168 170
169 if (OnCloseAgentConnection != null) 171 if (OnCloseAgentConnection != null)
170 { 172 {
@@ -199,14 +201,14 @@ namespace OpenSim.Region.Environment.Scenes
199 private void InformClientOfNeighbourAsync(ScenePresence avatar, AgentCircuitData a, ulong regionHandle, 201 private void InformClientOfNeighbourAsync(ScenePresence avatar, AgentCircuitData a, ulong regionHandle,
200 IPEndPoint endPoint) 202 IPEndPoint endPoint)
201 { 203 {
202 MainLog.Instance.Notice("INTERGRID", "Starting to inform client about neighbours"); 204 m_log.Info("[INTERGRID]: Starting to inform client about neighbours");
203 bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(regionHandle, a); 205 bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(regionHandle, a);
204 206
205 if (regionAccepted) 207 if (regionAccepted)
206 { 208 {
207 avatar.ControllingClient.InformClientOfNeighbour(regionHandle, endPoint); 209 avatar.ControllingClient.InformClientOfNeighbour(regionHandle, endPoint);
208 avatar.AddNeighbourRegion(regionHandle); 210 avatar.AddNeighbourRegion(regionHandle);
209 MainLog.Instance.Notice("INTERGRID", "Completed inform client about neighbours"); 211 m_log.Info("[INTERGRID]: Completed inform client about neighbours");
210 } 212 }
211 } 213 }
212 214
@@ -291,17 +293,17 @@ namespace OpenSim.Region.Environment.Scenes
291 293
292 private void InformNeighboursThatRegionIsUpAsync(RegionInfo region, ulong regionhandle) 294 private void InformNeighboursThatRegionIsUpAsync(RegionInfo region, ulong regionhandle)
293 { 295 {
294 MainLog.Instance.Notice("INTERGRID", "Starting to inform neighbors that I'm here"); 296 m_log.Info("[INTERGRID]: Starting to inform neighbors that I'm here");
295 bool regionAccepted = 297 bool regionAccepted =
296 m_commsProvider.InterRegion.RegionUp((new SearializableRegionInfo(region)), regionhandle); 298 m_commsProvider.InterRegion.RegionUp((new SearializableRegionInfo(region)), regionhandle);
297 299
298 if (regionAccepted) 300 if (regionAccepted)
299 { 301 {
300 MainLog.Instance.Notice("INTERGRID", "Completed informing neighbors that I'm here"); 302 m_log.Info("[INTERGRID]: Completed informing neighbors that I'm here");
301 } 303 }
302 else 304 else
303 { 305 {
304 MainLog.Instance.Notice("INTERGRID", "Failed to inform neighbors that I'm here"); 306 m_log.Info("[INTERGRID]: Failed to inform neighbors that I'm here");
305 } 307 }
306 } 308 }
307 309
@@ -311,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes
311 /// </summary> 313 /// </summary>
312 public void InformNeighborsThatRegionisUp(RegionInfo region) 314 public void InformNeighborsThatRegionisUp(RegionInfo region)
313 { 315 {
314 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 316 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
315 317
316 318
317 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>(); 319 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
@@ -343,7 +345,7 @@ namespace OpenSim.Region.Environment.Scenes
343 /// </summary> 345 /// </summary>
344 private void SendChildAgentDataUpdateAsync(ChildAgentDataUpdate cAgentData, ScenePresence presence) 346 private void SendChildAgentDataUpdateAsync(ChildAgentDataUpdate cAgentData, ScenePresence presence)
345 { 347 {
346 //MainLog.Instance.Notice("INTERGRID", "Informing neighbors about my agent."); 348 //m_log.Info("[INTERGRID]: Informing neighbors about my agent.");
347 try 349 try
348 { 350 {
349 foreach (ulong regionHandle in presence.KnownChildRegions) 351 foreach (ulong regionHandle in presence.KnownChildRegions)
@@ -352,11 +354,11 @@ namespace OpenSim.Region.Environment.Scenes
352 354
353 if (regionAccepted) 355 if (regionAccepted)
354 { 356 {
355 //MainLog.Instance.Notice("INTERGRID", "Completed sending a neighbor an update about my agent"); 357 //m_log.Info("[INTERGRID]: Completed sending a neighbor an update about my agent");
356 } 358 }
357 else 359 else
358 { 360 {
359 //MainLog.Instance.Notice("INTERGRID", "Failed sending a neighbor an update about my agent"); 361 //m_log.Info("[INTERGRID]: Failed sending a neighbor an update about my agent");
360 } 362 }
361 } 363 }
362 } 364 }
@@ -397,12 +399,12 @@ namespace OpenSim.Region.Environment.Scenes
397 399
398 if (regionAccepted) 400 if (regionAccepted)
399 { 401 {
400 MainLog.Instance.Notice("INTERGRID", "Completed sending agent Close agent Request to neighbor"); 402 m_log.Info("[INTERGRID]: Completed sending agent Close agent Request to neighbor");
401 presence.RemoveNeighbourRegion(regionHandle); 403 presence.RemoveNeighbourRegion(regionHandle);
402 } 404 }
403 else 405 else
404 { 406 {
405 MainLog.Instance.Notice("INTERGRID", "Failed sending agent Close agent Request to neighbor"); 407 m_log.Info("[INTERGRID]: Failed sending agent Close agent Request to neighbor");
406 408
407 } 409 }
408 410
@@ -431,7 +433,7 @@ namespace OpenSim.Region.Environment.Scenes
431 /// <returns></returns> 433 /// <returns></returns>
432 public virtual RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle) 434 public virtual RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
433 { 435 {
434 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending Grid Services Request about neighbor " + regionHandle.ToString()); 436 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending Grid Services Request about neighbor " + regionHandle.ToString());
435 return m_commsProvider.GridService.RequestNeighbourInfo(regionHandle); 437 return m_commsProvider.GridService.RequestNeighbourInfo(regionHandle);
436 } 438 }
437 439