diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Communications | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC-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 '')
6 files changed, 173 insertions, 162 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 25452c1..98419ab 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -36,6 +36,8 @@ namespace OpenSim.Region.Communications.Local | |||
36 | { | 36 | { |
37 | public class LocalBackEndServices : IGridServices, IInterRegionCommunications | 37 | public class LocalBackEndServices : IGridServices, IInterRegionCommunications |
38 | { | 38 | { |
39 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
40 | |||
39 | protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); | 41 | protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>(); |
40 | 42 | ||
41 | protected Dictionary<ulong, RegionCommsListener> m_regionListeners = | 43 | protected Dictionary<ulong, RegionCommsListener> m_regionListeners = |
@@ -93,8 +95,9 @@ namespace OpenSim.Region.Communications.Local | |||
93 | RegionCommsListener regionHost = new RegionCommsListener(); | 95 | RegionCommsListener regionHost = new RegionCommsListener(); |
94 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) | 96 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) |
95 | { | 97 | { |
96 | MainLog.Instance.Error("INTERREGION", | 98 | m_log.Error("[INTERREGION]: " + |
97 | "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); | 99 | "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. " + |
100 | "In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); | ||
98 | m_regionListeners.Remove(regionInfo.RegionHandle); | 101 | m_regionListeners.Remove(regionInfo.RegionHandle); |
99 | } | 102 | } |
100 | m_regionListeners.Add(regionInfo.RegionHandle, regionHost); | 103 | m_regionListeners.Add(regionInfo.RegionHandle, regionHost); |
@@ -105,7 +108,7 @@ namespace OpenSim.Region.Communications.Local | |||
105 | { | 108 | { |
106 | // Already in our list, so the region went dead and restarted. | 109 | // Already in our list, so the region went dead and restarted. |
107 | m_regions.Remove(regionInfo.RegionHandle); | 110 | m_regions.Remove(regionInfo.RegionHandle); |
108 | MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up."); | 111 | m_log.Warn("[INTERREGION]: Region registered twice. Region went down and came back up."); |
109 | 112 | ||
110 | RegionCommsListener regionHost = new RegionCommsListener(); | 113 | RegionCommsListener regionHost = new RegionCommsListener(); |
111 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) | 114 | if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) |
@@ -229,7 +232,7 @@ namespace OpenSim.Region.Communications.Local | |||
229 | { | 232 | { |
230 | // Console.WriteLine("CommsManager- Informing a region to expect child agent"); | 233 | // Console.WriteLine("CommsManager- Informing a region to expect child agent"); |
231 | m_regionListeners[regionHandle].TriggerChildAgentUpdate(regionHandle, cAgentData); | 234 | m_regionListeners[regionHandle].TriggerChildAgentUpdate(regionHandle, cAgentData); |
232 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); | 235 | //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); |
233 | 236 | ||
234 | return true; | 237 | return true; |
235 | } | 238 | } |
@@ -292,13 +295,13 @@ namespace OpenSim.Region.Communications.Local | |||
292 | //should change from agentCircuitData | 295 | //should change from agentCircuitData |
293 | { | 296 | { |
294 | //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); | 297 | //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); |
295 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); | 298 | //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); |
296 | 299 | ||
297 | if (m_regionListeners.ContainsKey(regionHandle)) | 300 | if (m_regionListeners.ContainsKey(regionHandle)) |
298 | { | 301 | { |
299 | // Console.WriteLine("CommsManager- Informing a region to expect child agent"); | 302 | // Console.WriteLine("CommsManager- Informing a region to expect child agent"); |
300 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); | 303 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); |
301 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); | 304 | //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); |
302 | 305 | ||
303 | return true; | 306 | return true; |
304 | } | 307 | } |
@@ -389,11 +392,11 @@ namespace OpenSim.Region.Communications.Local | |||
389 | 392 | ||
390 | public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) | 393 | public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) |
391 | { | 394 | { |
392 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); | 395 | //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); |
393 | 396 | ||
394 | if (m_regionListeners.ContainsKey(regionHandle)) | 397 | if (m_regionListeners.ContainsKey(regionHandle)) |
395 | { | 398 | { |
396 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); | 399 | //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); |
397 | 400 | ||
398 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); | 401 | m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); |
399 | } | 402 | } |
@@ -443,11 +446,11 @@ namespace OpenSim.Region.Communications.Local | |||
443 | 446 | ||
444 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) | 447 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) |
445 | { | 448 | { |
446 | // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); | 449 | // m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); |
447 | 450 | ||
448 | if (m_regionListeners.ContainsKey(regionHandle)) | 451 | if (m_regionListeners.ContainsKey(regionHandle)) |
449 | { | 452 | { |
450 | //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); | 453 | //m_log.Info("[INTER]: " + rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); |
451 | 454 | ||
452 | TriggerExpectUser(regionHandle, agentData); | 455 | TriggerExpectUser(regionHandle, agentData); |
453 | return true; | 456 | return true; |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 2848b8a..f6dd379 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -44,6 +44,8 @@ namespace OpenSim.Region.Communications.Local | |||
44 | 44 | ||
45 | public class LocalLoginService : LoginService | 45 | public class LocalLoginService : LoginService |
46 | { | 46 | { |
47 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | |||
47 | private CommunicationsLocal m_Parent; | 49 | private CommunicationsLocal m_Parent; |
48 | 50 | ||
49 | private NetworkServersInfo serversInfo; | 51 | private NetworkServersInfo serversInfo; |
@@ -77,7 +79,7 @@ namespace OpenSim.Region.Communications.Local | |||
77 | if (!authUsers) | 79 | if (!authUsers) |
78 | { | 80 | { |
79 | //no current user account so make one | 81 | //no current user account so make one |
80 | MainLog.Instance.Notice("LOGIN", "No user account found so creating a new one."); | 82 | m_log.Info("[LOGIN]: No user account found so creating a new one."); |
81 | 83 | ||
82 | m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY); | 84 | m_userManager.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY); |
83 | 85 | ||
@@ -97,14 +99,14 @@ namespace OpenSim.Region.Communications.Local | |||
97 | if (!authUsers) | 99 | if (!authUsers) |
98 | { | 100 | { |
99 | //for now we will accept any password in sandbox mode | 101 | //for now we will accept any password in sandbox mode |
100 | MainLog.Instance.Notice("LOGIN", "Authorising user (no actual password check)"); | 102 | m_log.Info("[LOGIN]: Authorising user (no actual password check)"); |
101 | 103 | ||
102 | return true; | 104 | return true; |
103 | } | 105 | } |
104 | else | 106 | else |
105 | { | 107 | { |
106 | MainLog.Instance.Notice( | 108 | m_log.Info( |
107 | "LOGIN", "Authenticating " + profile.username + " " + profile.surname); | 109 | "[LOGIN]: Authenticating " + profile.username + " " + profile.surname); |
108 | 110 | ||
109 | if (!password.StartsWith("$1$")) | 111 | if (!password.StartsWith("$1$")) |
110 | password = "$1$" + Util.Md5Hash(password); | 112 | password = "$1$" + Util.Md5Hash(password); |
@@ -166,7 +168,7 @@ namespace OpenSim.Region.Communications.Local | |||
166 | } | 168 | } |
167 | else | 169 | else |
168 | { | 170 | { |
169 | MainLog.Instance.Warn("LOGIN", "Not found region " + currentRegion); | 171 | m_log.Warn("[LOGIN]: Not found region " + currentRegion); |
170 | } | 172 | } |
171 | } | 173 | } |
172 | private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL) | 174 | private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL) |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 1576bf3..f04574a 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -47,6 +47,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
47 | { | 47 | { |
48 | public class OGS1GridServices : IGridServices, IInterRegionCommunications | 48 | public class OGS1GridServices : IGridServices, IInterRegionCommunications |
49 | { | 49 | { |
50 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
51 | |||
50 | private LocalBackEndServices m_localBackend = new LocalBackEndServices(); | 52 | private LocalBackEndServices m_localBackend = new LocalBackEndServices(); |
51 | private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); | 53 | private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); |
52 | private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>(); | 54 | private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>(); |
@@ -138,7 +140,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
138 | GridResp = GridReq.Send(serversInfo.GridURL, 10000); | 140 | GridResp = GridReq.Send(serversInfo.GridURL, 10000); |
139 | } catch (Exception ex) | 141 | } catch (Exception ex) |
140 | { | 142 | { |
141 | MainLog.Instance.Error("Unable to connect to grid. Grid server not running?"); | 143 | m_log.Error("Unable to connect to grid. Grid server not running?"); |
142 | throw(ex); | 144 | throw(ex); |
143 | } | 145 | } |
144 | Hashtable GridRespData = (Hashtable)GridResp.Value; | 146 | Hashtable GridRespData = (Hashtable)GridResp.Value; |
@@ -148,7 +150,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
148 | if (GridRespData.ContainsKey("error")) | 150 | if (GridRespData.ContainsKey("error")) |
149 | { | 151 | { |
150 | string errorstring = (string) GridRespData["error"]; | 152 | string errorstring = (string) GridRespData["error"]; |
151 | MainLog.Instance.Error("Unable to connect to grid: " + errorstring); | 153 | m_log.Error("Unable to connect to grid: " + errorstring); |
152 | return null; | 154 | return null; |
153 | } | 155 | } |
154 | else | 156 | else |
@@ -330,9 +332,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
330 | } | 332 | } |
331 | catch (WebException) | 333 | catch (WebException) |
332 | { | 334 | { |
333 | MainLog.Instance.Error("GRID", | 335 | m_log.Error("[GRID]: " + |
334 | "Region lookup failed for: " + regionHandle.ToString() + | 336 | "Region lookup failed for: " + regionHandle.ToString() + |
335 | " - Is the GridServer down?"); | 337 | " - Is the GridServer down?"); |
336 | return null; | 338 | return null; |
337 | } | 339 | } |
338 | } | 340 | } |
@@ -421,7 +423,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
421 | } | 423 | } |
422 | catch (Exception e) | 424 | catch (Exception e) |
423 | { | 425 | { |
424 | MainLog.Instance.Error("MapBlockQuery XMLRPC failure: " + e.ToString()); | 426 | m_log.Error("MapBlockQuery XMLRPC failure: " + e.ToString()); |
425 | return new Hashtable(); | 427 | return new Hashtable(); |
426 | } | 428 | } |
427 | } | 429 | } |
@@ -482,7 +484,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
482 | 484 | ||
483 | m_localBackend.TriggerExpectUser(regionHandle, agentData); | 485 | m_localBackend.TriggerExpectUser(regionHandle, agentData); |
484 | 486 | ||
485 | MainLog.Instance.Verbose("GRID", "Welcoming new user..."); | 487 | m_log.Info("[GRID]: Welcoming new user..."); |
486 | 488 | ||
487 | return new XmlRpcResponse(); | 489 | return new XmlRpcResponse(); |
488 | } | 490 | } |
@@ -555,7 +557,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
555 | Console.WriteLine("remoting object not found"); | 557 | Console.WriteLine("remoting object not found"); |
556 | } | 558 | } |
557 | remObject = null; | 559 | remObject = null; |
558 | //MainLog.Instance.Verbose("INTER", | 560 | //m_log.Info("[INTER]: " + |
559 | //gdebugRegionName + | 561 | //gdebugRegionName + |
560 | //": OGS1 tried to Update Child Agent data on outside region and got " + | 562 | //": OGS1 tried to Update Child Agent data on outside region and got " + |
561 | //retValue.ToString()); | 563 | //retValue.ToString()); |
@@ -569,45 +571,45 @@ namespace OpenSim.Region.Communications.OGS1 | |||
569 | catch (RemotingException e) | 571 | catch (RemotingException e) |
570 | { | 572 | { |
571 | NoteDeadRegion(regionHandle); | 573 | NoteDeadRegion(regionHandle); |
572 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + | 574 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + |
573 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 575 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
574 | MainLog.Instance.Debug(e.ToString()); | 576 | m_log.Debug(e.ToString()); |
575 | return false; | 577 | return false; |
576 | } | 578 | } |
577 | catch (SocketException e) | 579 | catch (SocketException e) |
578 | { | 580 | { |
579 | NoteDeadRegion(regionHandle); | 581 | NoteDeadRegion(regionHandle); |
580 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region: " + " " + | 582 | m_log.Warn("Socket Error: Unable to connect to adjacent region: " + " " + |
581 | regInfo.RegionLocX + "," + regInfo.RegionLocY); | 583 | regInfo.RegionLocX + "," + regInfo.RegionLocY); |
582 | MainLog.Instance.Debug(e.ToString()); | 584 | m_log.Debug(e.ToString()); |
583 | return false; | 585 | return false; |
584 | } | 586 | } |
585 | catch (InvalidCredentialException e) | 587 | catch (InvalidCredentialException e) |
586 | { | 588 | { |
587 | NoteDeadRegion(regionHandle); | 589 | NoteDeadRegion(regionHandle); |
588 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region: " + | 590 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + |
589 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 591 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
590 | MainLog.Instance.Debug(e.ToString()); | 592 | m_log.Debug(e.ToString()); |
591 | return false; | 593 | return false; |
592 | } | 594 | } |
593 | catch (AuthenticationException e) | 595 | catch (AuthenticationException e) |
594 | { | 596 | { |
595 | NoteDeadRegion(regionHandle); | 597 | NoteDeadRegion(regionHandle); |
596 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region: " + | 598 | m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + |
597 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 599 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
598 | MainLog.Instance.Debug(e.ToString()); | 600 | m_log.Debug(e.ToString()); |
599 | return false; | 601 | return false; |
600 | } | 602 | } |
601 | catch (Exception e) | 603 | catch (Exception e) |
602 | { | 604 | { |
603 | NoteDeadRegion(regionHandle); | 605 | NoteDeadRegion(regionHandle); |
604 | MainLog.Instance.Debug(e.ToString()); | 606 | m_log.Debug(e.ToString()); |
605 | return false; | 607 | return false; |
606 | } | 608 | } |
607 | } | 609 | } |
608 | else | 610 | else |
609 | { | 611 | { |
610 | //MainLog.Instance.Verbose("INTERREGION", "Skipped Sending Child Update to a region because it failed too many times:" + regionHandle.ToString()); | 612 | //m_log.Info("[INTERREGION]: Skipped Sending Child Update to a region because it failed too many times:" + regionHandle.ToString()); |
611 | return false; | 613 | return false; |
612 | } | 614 | } |
613 | } | 615 | } |
@@ -650,10 +652,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
650 | Console.WriteLine("remoting object not found"); | 652 | Console.WriteLine("remoting object not found"); |
651 | } | 653 | } |
652 | remObject = null; | 654 | remObject = null; |
653 | MainLog.Instance.Verbose("INTER", | 655 | m_log.Info("[INTER]: " + |
654 | gdebugRegionName + ": OGS1 tried to InformRegionOfChildAgent for " + | 656 | gdebugRegionName + ": OGS1 tried to InformRegionOfChildAgent for " + |
655 | agentData.firstname + " " + agentData.lastname + " and got " + | 657 | agentData.firstname + " " + agentData.lastname + " and got " + |
656 | retValue.ToString()); | 658 | retValue.ToString()); |
657 | 659 | ||
658 | return retValue; | 660 | return retValue; |
659 | 661 | ||
@@ -664,41 +666,41 @@ namespace OpenSim.Region.Communications.OGS1 | |||
664 | catch (RemotingException e) | 666 | catch (RemotingException e) |
665 | { | 667 | { |
666 | NoteDeadRegion(regionHandle); | 668 | NoteDeadRegion(regionHandle); |
667 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + | 669 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + |
668 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 670 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
669 | MainLog.Instance.Debug(e.ToString()); | 671 | m_log.Debug(e.ToString()); |
670 | return false; | 672 | return false; |
671 | } | 673 | } |
672 | catch (SocketException e) | 674 | catch (SocketException e) |
673 | { | 675 | { |
674 | NoteDeadRegion(regionHandle); | 676 | NoteDeadRegion(regionHandle); |
675 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + | 677 | m_log.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + |
676 | regInfo.RegionLocX + "," + regInfo.RegionLocY); | 678 | regInfo.RegionLocX + "," + regInfo.RegionLocY); |
677 | MainLog.Instance.Debug(e.ToString()); | 679 | m_log.Debug(e.ToString()); |
678 | return false; | 680 | return false; |
679 | } | 681 | } |
680 | catch (InvalidCredentialException e) | 682 | catch (InvalidCredentialException e) |
681 | { | 683 | { |
682 | NoteDeadRegion(regionHandle); | 684 | NoteDeadRegion(regionHandle); |
683 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + | 685 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + |
684 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 686 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
685 | MainLog.Instance.Debug(e.ToString()); | 687 | m_log.Debug(e.ToString()); |
686 | return false; | 688 | return false; |
687 | } | 689 | } |
688 | catch (AuthenticationException e) | 690 | catch (AuthenticationException e) |
689 | { | 691 | { |
690 | NoteDeadRegion(regionHandle); | 692 | NoteDeadRegion(regionHandle); |
691 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region: " + | 693 | m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + |
692 | regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 694 | regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
693 | MainLog.Instance.Debug(e.ToString()); | 695 | m_log.Debug(e.ToString()); |
694 | return false; | 696 | return false; |
695 | } | 697 | } |
696 | catch (Exception e) | 698 | catch (Exception e) |
697 | { | 699 | { |
698 | NoteDeadRegion(regionHandle); | 700 | NoteDeadRegion(regionHandle); |
699 | MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + | 701 | m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + |
700 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 702 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
701 | MainLog.Instance.Debug(e.ToString()); | 703 | m_log.Debug(e.ToString()); |
702 | return false; | 704 | return false; |
703 | } | 705 | } |
704 | } | 706 | } |
@@ -748,7 +750,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
748 | Console.WriteLine("remoting object not found"); | 750 | Console.WriteLine("remoting object not found"); |
749 | } | 751 | } |
750 | remObject = null; | 752 | remObject = null; |
751 | MainLog.Instance.Verbose("INTER", gdebugRegionName + ": OGS1 tried to inform region I'm up"); | 753 | m_log.Info("[INTER]: " + gdebugRegionName + ": OGS1 tried to inform region I'm up"); |
752 | 754 | ||
753 | return retValue; | 755 | return retValue; |
754 | } | 756 | } |
@@ -765,49 +767,49 @@ namespace OpenSim.Region.Communications.OGS1 | |||
765 | } | 767 | } |
766 | catch (RemotingException e) | 768 | catch (RemotingException e) |
767 | { | 769 | { |
768 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region using tcp://" + | 770 | m_log.Warn("Remoting Error: Unable to connect to adjacent region using tcp://" + |
769 | regInfo.RemotingAddress + | 771 | regInfo.RemotingAddress + |
770 | ":" + regInfo.RemotingPort + | 772 | ":" + regInfo.RemotingPort + |
771 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + | 773 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + |
772 | " - Is this neighbor up?"); | 774 | " - Is this neighbor up?"); |
773 | MainLog.Instance.Debug(e.ToString()); | 775 | m_log.Debug(e.ToString()); |
774 | return false; | 776 | return false; |
775 | } | 777 | } |
776 | catch (SocketException e) | 778 | catch (SocketException e) |
777 | { | 779 | { |
778 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + | 780 | m_log.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + |
779 | regInfo.RemotingAddress + | 781 | regInfo.RemotingAddress + |
780 | ":" + regInfo.RemotingPort + | 782 | ":" + regInfo.RemotingPort + |
781 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + | 783 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + |
782 | " - Is this neighbor up?"); | 784 | " - Is this neighbor up?"); |
783 | MainLog.Instance.Debug(e.ToString()); | 785 | m_log.Debug(e.ToString()); |
784 | return false; | 786 | return false; |
785 | } | 787 | } |
786 | catch (InvalidCredentialException e) | 788 | catch (InvalidCredentialException e) |
787 | { | 789 | { |
788 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + | 790 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + |
789 | regInfo.RemotingAddress + | 791 | regInfo.RemotingAddress + |
790 | ":" + regInfo.RemotingPort + | 792 | ":" + regInfo.RemotingPort + |
791 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 793 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
792 | MainLog.Instance.Debug(e.ToString()); | 794 | m_log.Debug(e.ToString()); |
793 | return false; | 795 | return false; |
794 | } | 796 | } |
795 | catch (AuthenticationException e) | 797 | catch (AuthenticationException e) |
796 | { | 798 | { |
797 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + | 799 | m_log.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + |
798 | regInfo.RemotingAddress + | 800 | regInfo.RemotingAddress + |
799 | ":" + regInfo.RemotingPort + | 801 | ":" + regInfo.RemotingPort + |
800 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 802 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
801 | MainLog.Instance.Debug(e.ToString()); | 803 | m_log.Debug(e.ToString()); |
802 | return false; | 804 | return false; |
803 | } | 805 | } |
804 | catch (Exception e) | 806 | catch (Exception e) |
805 | { | 807 | { |
806 | // This line errors with a Null Reference Exception.. Why? @.@ | 808 | // This line errors with a Null Reference Exception.. Why? @.@ |
807 | //MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + | 809 | //m_log.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
808 | // ":" + regInfo.RemotingPort + | 810 | // ":" + regInfo.RemotingPort + |
809 | //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); | 811 | //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); |
810 | MainLog.Instance.Debug(e.ToString()); | 812 | m_log.Debug(e.ToString()); |
811 | return false; | 813 | return false; |
812 | } | 814 | } |
813 | } | 815 | } |
@@ -860,41 +862,41 @@ namespace OpenSim.Region.Communications.OGS1 | |||
860 | catch (RemotingException e) | 862 | catch (RemotingException e) |
861 | { | 863 | { |
862 | NoteDeadRegion(regionHandle); | 864 | NoteDeadRegion(regionHandle); |
863 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + | 865 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + |
864 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 866 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
865 | MainLog.Instance.Debug(e.ToString()); | 867 | m_log.Debug(e.ToString()); |
866 | return false; | 868 | return false; |
867 | } | 869 | } |
868 | catch (SocketException e) | 870 | catch (SocketException e) |
869 | { | 871 | { |
870 | NoteDeadRegion(regionHandle); | 872 | NoteDeadRegion(regionHandle); |
871 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + | 873 | m_log.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + |
872 | regInfo.RegionLocX + "," + regInfo.RegionLocY); | 874 | regInfo.RegionLocX + "," + regInfo.RegionLocY); |
873 | MainLog.Instance.Debug(e.ToString()); | 875 | m_log.Debug(e.ToString()); |
874 | return false; | 876 | return false; |
875 | } | 877 | } |
876 | catch (InvalidCredentialException e) | 878 | catch (InvalidCredentialException e) |
877 | { | 879 | { |
878 | NoteDeadRegion(regionHandle); | 880 | NoteDeadRegion(regionHandle); |
879 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + | 881 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + |
880 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 882 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
881 | MainLog.Instance.Debug(e.ToString()); | 883 | m_log.Debug(e.ToString()); |
882 | return false; | 884 | return false; |
883 | } | 885 | } |
884 | catch (AuthenticationException e) | 886 | catch (AuthenticationException e) |
885 | { | 887 | { |
886 | NoteDeadRegion(regionHandle); | 888 | NoteDeadRegion(regionHandle); |
887 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region: " + | 889 | m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + |
888 | regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 890 | regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
889 | MainLog.Instance.Debug(e.ToString()); | 891 | m_log.Debug(e.ToString()); |
890 | return false; | 892 | return false; |
891 | } | 893 | } |
892 | catch (Exception e) | 894 | catch (Exception e) |
893 | { | 895 | { |
894 | NoteDeadRegion(regionHandle); | 896 | NoteDeadRegion(regionHandle); |
895 | MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + | 897 | m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + |
896 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 898 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
897 | MainLog.Instance.Debug(e.ToString()); | 899 | m_log.Debug(e.ToString()); |
898 | return false; | 900 | return false; |
899 | } | 901 | } |
900 | } | 902 | } |
@@ -947,9 +949,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
947 | catch (RemotingException e) | 949 | catch (RemotingException e) |
948 | { | 950 | { |
949 | NoteDeadRegion(regionHandle); | 951 | NoteDeadRegion(regionHandle); |
950 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + | 952 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + |
951 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 953 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
952 | MainLog.Instance.Debug(e.ToString()); | 954 | m_log.Debug(e.ToString()); |
953 | return false; | 955 | return false; |
954 | } | 956 | } |
955 | catch | 957 | catch |
@@ -1000,9 +1002,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1000 | catch (RemotingException e) | 1002 | catch (RemotingException e) |
1001 | { | 1003 | { |
1002 | NoteDeadRegion(regionHandle); | 1004 | NoteDeadRegion(regionHandle); |
1003 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + | 1005 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + |
1004 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1006 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1005 | MainLog.Instance.Debug(e.ToString()); | 1007 | m_log.Debug(e.ToString()); |
1006 | return false; | 1008 | return false; |
1007 | } | 1009 | } |
1008 | catch | 1010 | catch |
@@ -1052,61 +1054,61 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1052 | catch (RemotingException e) | 1054 | catch (RemotingException e) |
1053 | { | 1055 | { |
1054 | NoteDeadRegion(regionHandle); | 1056 | NoteDeadRegion(regionHandle); |
1055 | MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName + | 1057 | m_log.Warn("Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName + |
1056 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1058 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1057 | //MainLog.Instance.Debug(e.ToString()); | 1059 | //m_log.Debug(e.ToString()); |
1058 | return false; | 1060 | return false; |
1059 | } | 1061 | } |
1060 | 1062 | ||
1061 | catch (SocketException e) | 1063 | catch (SocketException e) |
1062 | { | 1064 | { |
1063 | NoteDeadRegion(regionHandle); | 1065 | NoteDeadRegion(regionHandle); |
1064 | MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + | 1066 | m_log.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + |
1065 | regInfo.RemotingAddress + | 1067 | regInfo.RemotingAddress + |
1066 | ":" + regInfo.RemotingPort + | 1068 | ":" + regInfo.RemotingPort + |
1067 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + | 1069 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + |
1068 | " - Is this neighbor up?"); | 1070 | " - Is this neighbor up?"); |
1069 | MainLog.Instance.Debug(e.ToString()); | 1071 | m_log.Debug(e.ToString()); |
1070 | return false; | 1072 | return false; |
1071 | } | 1073 | } |
1072 | catch (InvalidCredentialException e) | 1074 | catch (InvalidCredentialException e) |
1073 | { | 1075 | { |
1074 | NoteDeadRegion(regionHandle); | 1076 | NoteDeadRegion(regionHandle); |
1075 | MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + | 1077 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + |
1076 | regInfo.RemotingAddress + | 1078 | regInfo.RemotingAddress + |
1077 | ":" + regInfo.RemotingPort + | 1079 | ":" + regInfo.RemotingPort + |
1078 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1080 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1079 | MainLog.Instance.Debug(e.ToString()); | 1081 | m_log.Debug(e.ToString()); |
1080 | return false; | 1082 | return false; |
1081 | } | 1083 | } |
1082 | catch (AuthenticationException e) | 1084 | catch (AuthenticationException e) |
1083 | { | 1085 | { |
1084 | NoteDeadRegion(regionHandle); | 1086 | NoteDeadRegion(regionHandle); |
1085 | MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + | 1087 | m_log.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + |
1086 | regInfo.RemotingAddress + | 1088 | regInfo.RemotingAddress + |
1087 | ":" + regInfo.RemotingPort + | 1089 | ":" + regInfo.RemotingPort + |
1088 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1090 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1089 | MainLog.Instance.Debug(e.ToString()); | 1091 | m_log.Debug(e.ToString()); |
1090 | return false; | 1092 | return false; |
1091 | } | 1093 | } |
1092 | catch (WebException e) | 1094 | catch (WebException e) |
1093 | { | 1095 | { |
1094 | NoteDeadRegion(regionHandle); | 1096 | NoteDeadRegion(regionHandle); |
1095 | MainLog.Instance.Warn("WebException exception: Unable to connect to adjacent region using tcp://" + | 1097 | m_log.Warn("WebException exception: Unable to connect to adjacent region using tcp://" + |
1096 | regInfo.RemotingAddress + | 1098 | regInfo.RemotingAddress + |
1097 | ":" + regInfo.RemotingPort + | 1099 | ":" + regInfo.RemotingPort + |
1098 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1100 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1099 | MainLog.Instance.Debug(e.ToString()); | 1101 | m_log.Debug(e.ToString()); |
1100 | return false; | 1102 | return false; |
1101 | } | 1103 | } |
1102 | catch (Exception e) | 1104 | catch (Exception e) |
1103 | { | 1105 | { |
1104 | NoteDeadRegion(regionHandle); | 1106 | NoteDeadRegion(regionHandle); |
1105 | // This line errors with a Null Reference Exception.. Why? @.@ | 1107 | // This line errors with a Null Reference Exception.. Why? @.@ |
1106 | //MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + | 1108 | //m_log.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
1107 | // ":" + regInfo.RemotingPort + | 1109 | // ":" + regInfo.RemotingPort + |
1108 | //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); | 1110 | //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); |
1109 | MainLog.Instance.Debug(e.ToString()); | 1111 | m_log.Debug(e.ToString()); |
1110 | return false; | 1112 | return false; |
1111 | } | 1113 | } |
1112 | } | 1114 | } |
@@ -1133,7 +1135,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1133 | /// <returns></returns> | 1135 | /// <returns></returns> |
1134 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) | 1136 | public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) |
1135 | { | 1137 | { |
1136 | //MainLog.Instance.Verbose("INTER", gdebugRegionName + ": Incoming OGS1 Agent " + agentData.firstname + " " + agentData.lastname); | 1138 | //m_log.Info("[INTER]: " + gdebugRegionName + ": Incoming OGS1 Agent " + agentData.firstname + " " + agentData.lastname); |
1137 | 1139 | ||
1138 | try | 1140 | try |
1139 | { | 1141 | { |
@@ -1141,16 +1143,16 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1141 | } | 1143 | } |
1142 | catch (RemotingException) | 1144 | catch (RemotingException) |
1143 | { | 1145 | { |
1144 | //MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1146 | //m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1145 | return false; | 1147 | return false; |
1146 | } | 1148 | } |
1147 | } | 1149 | } |
1148 | 1150 | ||
1149 | public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) | 1151 | public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) |
1150 | { | 1152 | { |
1151 | MainLog.Instance.Verbose("INTER", | 1153 | m_log.Info("[INTER]: " + |
1152 | gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + | 1154 | gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + |
1153 | "," + regionData.RegionLocY + "). Giving this region a fresh set of 'dead' tries"); | 1155 | "," + regionData.RegionLocY + "). Giving this region a fresh set of 'dead' tries"); |
1154 | 1156 | ||
1155 | try | 1157 | try |
1156 | { | 1158 | { |
@@ -1169,14 +1171,14 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1169 | 1171 | ||
1170 | catch (RemotingException e) | 1172 | catch (RemotingException e) |
1171 | { | 1173 | { |
1172 | MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1174 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1173 | return false; | 1175 | return false; |
1174 | } | 1176 | } |
1175 | } | 1177 | } |
1176 | 1178 | ||
1177 | public bool TriggerChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) | 1179 | public bool TriggerChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) |
1178 | { | 1180 | { |
1179 | //MainLog.Instance.Verbose("INTER", "Incoming OGS1 Child Agent Data Update"); | 1181 | //m_log.Info("[INTER]: Incoming OGS1 Child Agent Data Update"); |
1180 | 1182 | ||
1181 | try | 1183 | try |
1182 | { | 1184 | { |
@@ -1184,7 +1186,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1184 | } | 1186 | } |
1185 | catch (RemotingException e) | 1187 | catch (RemotingException e) |
1186 | { | 1188 | { |
1187 | MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1189 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1188 | return false; | 1190 | return false; |
1189 | } | 1191 | } |
1190 | } | 1192 | } |
@@ -1206,7 +1208,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1206 | } | 1208 | } |
1207 | catch (RemotingException e) | 1209 | catch (RemotingException e) |
1208 | { | 1210 | { |
1209 | MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1211 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1210 | return false; | 1212 | return false; |
1211 | } | 1213 | } |
1212 | } | 1214 | } |
@@ -1226,7 +1228,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1226 | } | 1228 | } |
1227 | catch (RemotingException e) | 1229 | catch (RemotingException e) |
1228 | { | 1230 | { |
1229 | MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1231 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1230 | return false; | 1232 | return false; |
1231 | } | 1233 | } |
1232 | } | 1234 | } |
@@ -1239,7 +1241,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1239 | } | 1241 | } |
1240 | catch (RemotingException e) | 1242 | catch (RemotingException e) |
1241 | { | 1243 | { |
1242 | MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1244 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1243 | return false; | 1245 | return false; |
1244 | } | 1246 | } |
1245 | } | 1247 | } |
@@ -1252,7 +1254,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1252 | } | 1254 | } |
1253 | catch (RemotingException) | 1255 | catch (RemotingException) |
1254 | { | 1256 | { |
1255 | MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to neighbour to tell it to close a child connection"); | 1257 | m_log.Info("[INTERREGION]: Remoting Error: Unable to connect to neighbour to tell it to close a child connection"); |
1256 | return false; | 1258 | return false; |
1257 | } | 1259 | } |
1258 | 1260 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index b39e0b7..217bb81 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |||
@@ -141,6 +141,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
141 | 141 | ||
142 | public class OGS1InterRegionRemoting : MarshalByRefObject | 142 | public class OGS1InterRegionRemoting : MarshalByRefObject |
143 | { | 143 | { |
144 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
145 | |||
144 | public OGS1InterRegionRemoting() | 146 | public OGS1InterRegionRemoting() |
145 | { | 147 | { |
146 | } | 148 | } |
@@ -230,18 +232,18 @@ namespace OpenSim.Region.Communications.OGS1 | |||
230 | return false; | 232 | return false; |
231 | } | 233 | } |
232 | } | 234 | } |
235 | |||
233 | public bool TellRegionToCloseChildConnection(ulong regionHandle, Guid agentID) | 236 | public bool TellRegionToCloseChildConnection(ulong regionHandle, Guid agentID) |
234 | { | 237 | { |
235 | try | 238 | try |
236 | { | 239 | { |
237 | return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); | 240 | return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); |
238 | |||
239 | } | 241 | } |
240 | catch (RemotingException) | 242 | catch (RemotingException) |
241 | { | 243 | { |
242 | OpenSim.Framework.Console.MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to remote region: " + regionHandle.ToString()); | 244 | m_log.Info("[INTERREGION]: Remoting Error: Unable to connect to remote region: " + regionHandle.ToString()); |
243 | return false; | 245 | return false; |
244 | } | 246 | } |
245 | } | 247 | } |
246 | } | 248 | } |
247 | } \ No newline at end of file | 249 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 1780707..656dd70 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -38,6 +38,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
38 | { | 38 | { |
39 | public class OGS1InventoryService : IInventoryServices | 39 | public class OGS1InventoryService : IInventoryServices |
40 | { | 40 | { |
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
41 | private string _inventoryServerUrl; | 43 | private string _inventoryServerUrl; |
42 | private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>(); | 44 | private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>(); |
43 | 45 | ||
@@ -71,9 +73,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
71 | { | 73 | { |
72 | try | 74 | try |
73 | { | 75 | { |
74 | MainLog.Instance.Verbose( | 76 | m_log.Info( |
75 | "INVENTORY", "Requesting inventory from {0}/GetInventory/ for user {1}", | 77 | String.Format("[INVENTORY]: Requesting inventory from {0}/GetInventory/ for user {1}", |
76 | _inventoryServerUrl, userID); | 78 | _inventoryServerUrl, userID)); |
77 | 79 | ||
78 | RestObjectPosterResponse<InventoryCollection> requester | 80 | RestObjectPosterResponse<InventoryCollection> requester |
79 | = new RestObjectPosterResponse<InventoryCollection>(); | 81 | = new RestObjectPosterResponse<InventoryCollection>(); |
@@ -83,7 +85,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
83 | } | 85 | } |
84 | catch (Exception e) | 86 | catch (Exception e) |
85 | { | 87 | { |
86 | MainLog.Instance.Error("INVENTORY", e.ToString()); | 88 | m_log.Error("[INVENTORY]: " + e.ToString()); |
87 | } | 89 | } |
88 | } | 90 | } |
89 | 91 | ||
@@ -96,9 +98,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
96 | LLUUID userID = response.UserID; | 98 | LLUUID userID = response.UserID; |
97 | if (m_RequestingInventory.ContainsKey(userID)) | 99 | if (m_RequestingInventory.ContainsKey(userID)) |
98 | { | 100 | { |
99 | MainLog.Instance.Verbose("INVENTORY", | 101 | m_log.Info(String.Format("[INVENTORY]: " + |
100 | "Received inventory response for user {0} containing {1} folders and {2} items", | 102 | "Received inventory response for user {0} containing {1} folders and {2} items", |
101 | userID, response.Folders.Count, response.AllItems.Count); | 103 | userID, response.Folders.Count, response.AllItems.Count)); |
102 | 104 | ||
103 | InventoryFolderImpl rootFolder = null; | 105 | InventoryFolderImpl rootFolder = null; |
104 | InventoryRequest request = m_RequestingInventory[userID]; | 106 | InventoryRequest request = m_RequestingInventory[userID]; |
@@ -132,10 +134,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
132 | } | 134 | } |
133 | else | 135 | else |
134 | { | 136 | { |
135 | MainLog.Instance.Warn( | 137 | m_log.Warn( |
136 | "INVENTORY", | 138 | String.Format("[INVENTORY]: " + |
137 | "Received inventory response for {0} for which we do not have a record of requesting!", | 139 | "Received inventory response for {0} for which we do not have a record of requesting!", |
138 | userID); | 140 | userID)); |
139 | } | 141 | } |
140 | } | 142 | } |
141 | 143 | ||
@@ -198,4 +200,4 @@ namespace OpenSim.Region.Communications.OGS1 | |||
198 | } | 200 | } |
199 | } | 201 | } |
200 | } | 202 | } |
201 | } \ No newline at end of file | 203 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 70b7e89..9a22d14 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -40,6 +40,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
40 | { | 40 | { |
41 | public class OGS1UserServices : IUserService | 41 | public class OGS1UserServices : IUserService |
42 | { | 42 | { |
43 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | |||
43 | private CommunicationsOGS1 m_parent; | 45 | private CommunicationsOGS1 m_parent; |
44 | 46 | ||
45 | public OGS1UserServices(CommunicationsOGS1 parent) | 47 | public OGS1UserServices(CommunicationsOGS1 parent) |
@@ -51,10 +53,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
51 | { | 53 | { |
52 | if (data.Contains("error_type")) | 54 | if (data.Contains("error_type")) |
53 | { | 55 | { |
54 | MainLog.Instance.Warn("GRID", | 56 | m_log.Warn("[GRID]: " + |
55 | "Error sent by user server when trying to get user profile: (" + | 57 | "Error sent by user server when trying to get user profile: (" + |
56 | data["error_type"] + | 58 | data["error_type"] + |
57 | "): " + data["error_desc"]); | 59 | "): " + data["error_desc"]); |
58 | return null; | 60 | return null; |
59 | } | 61 | } |
60 | 62 | ||
@@ -104,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
104 | } | 106 | } |
105 | else | 107 | else |
106 | { | 108 | { |
107 | MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); | 109 | m_log.Warn("[INTERGRID]: Got invalid queryID from userServer"); |
108 | } | 110 | } |
109 | return pickerlist; | 111 | return pickerlist; |
110 | } | 112 | } |
@@ -158,7 +160,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
158 | } | 160 | } |
159 | catch (System.Net.WebException) | 161 | catch (System.Net.WebException) |
160 | { | 162 | { |
161 | MainLog.Instance.Warn("LOGOFF", "Unable to notify grid server of user logoff"); | 163 | m_log.Warn("[LOGOFF]: Unable to notify grid server of user logoff"); |
162 | } | 164 | } |
163 | 165 | ||
164 | 166 | ||
@@ -186,8 +188,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
186 | } | 188 | } |
187 | catch (WebException e) | 189 | catch (WebException e) |
188 | { | 190 | { |
189 | MainLog.Instance.Warn("Error when trying to fetch Avatar Picker Response: " + | 191 | m_log.Warn("Error when trying to fetch Avatar Picker Response: " + |
190 | e.Message); | 192 | e.Message); |
191 | // Return Empty picker list (no results) | 193 | // Return Empty picker list (no results) |
192 | } | 194 | } |
193 | return pickerlist; | 195 | return pickerlist; |
@@ -209,8 +211,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
209 | } | 211 | } |
210 | catch (WebException e) | 212 | catch (WebException e) |
211 | { | 213 | { |
212 | MainLog.Instance.Warn("Error when trying to fetch profile data by name from remote user server: " + | 214 | m_log.Warn("Error when trying to fetch profile data by name from remote user server: " + |
213 | e.Message); | 215 | e.Message); |
214 | } | 216 | } |
215 | return null; | 217 | return null; |
216 | } | 218 | } |
@@ -299,24 +301,24 @@ namespace OpenSim.Region.Communications.OGS1 | |||
299 | } | 301 | } |
300 | else | 302 | else |
301 | { | 303 | { |
302 | MainLog.Instance.Warn("GRID", "Unable to add new friend, User Server Reported an issue"); | 304 | m_log.Warn("[GRID]: Unable to add new friend, User Server Reported an issue"); |
303 | } | 305 | } |
304 | } | 306 | } |
305 | else | 307 | else |
306 | { | 308 | { |
307 | MainLog.Instance.Warn("GRID", "Unable to add new friend, UserServer didn't understand me!"); | 309 | m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!"); |
308 | } | 310 | } |
309 | } | 311 | } |
310 | else | 312 | else |
311 | { | 313 | { |
312 | MainLog.Instance.Warn("GRID", "Unable to add new friend, UserServer didn't understand me!"); | 314 | m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!"); |
313 | 315 | ||
314 | } | 316 | } |
315 | } | 317 | } |
316 | catch (WebException e) | 318 | catch (WebException e) |
317 | { | 319 | { |
318 | MainLog.Instance.Warn("GRID","Error when trying to AddNewUserFriend: " + | 320 | m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " + |
319 | e.Message); | 321 | e.Message); |
320 | 322 | ||
321 | } | 323 | } |
322 | 324 | ||
@@ -352,24 +354,24 @@ namespace OpenSim.Region.Communications.OGS1 | |||
352 | } | 354 | } |
353 | else | 355 | else |
354 | { | 356 | { |
355 | MainLog.Instance.Warn("GRID", "Unable to remove friend, User Server Reported an issue"); | 357 | m_log.Warn("[GRID]: Unable to remove friend, User Server Reported an issue"); |
356 | } | 358 | } |
357 | } | 359 | } |
358 | else | 360 | else |
359 | { | 361 | { |
360 | MainLog.Instance.Warn("GRID", "Unable to remove friend, UserServer didn't understand me!"); | 362 | m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!"); |
361 | } | 363 | } |
362 | } | 364 | } |
363 | else | 365 | else |
364 | { | 366 | { |
365 | MainLog.Instance.Warn("GRID", "Unable to remove friend, UserServer didn't understand me!"); | 367 | m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!"); |
366 | 368 | ||
367 | } | 369 | } |
368 | } | 370 | } |
369 | catch (WebException e) | 371 | catch (WebException e) |
370 | { | 372 | { |
371 | MainLog.Instance.Warn("GRID", "Error when trying to RemoveUserFriend: " + | 373 | m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " + |
372 | e.Message); | 374 | e.Message); |
373 | 375 | ||
374 | } | 376 | } |
375 | } | 377 | } |
@@ -404,25 +406,24 @@ namespace OpenSim.Region.Communications.OGS1 | |||
404 | } | 406 | } |
405 | else | 407 | else |
406 | { | 408 | { |
407 | MainLog.Instance.Warn("GRID", "Unable to update_user_friend_perms, User Server Reported an issue"); | 409 | m_log.Warn("[GRID]: Unable to update_user_friend_perms, User Server Reported an issue"); |
408 | } | 410 | } |
409 | } | 411 | } |
410 | else | 412 | else |
411 | { | 413 | { |
412 | MainLog.Instance.Warn("GRID", "Unable to update_user_friend_perms, UserServer didn't understand me!"); | 414 | m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!"); |
413 | } | 415 | } |
414 | } | 416 | } |
415 | else | 417 | else |
416 | { | 418 | { |
417 | MainLog.Instance.Warn("GRID", "Unable to update_user_friend_perms, UserServer didn't understand me!"); | 419 | m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!"); |
418 | 420 | ||
419 | } | 421 | } |
420 | } | 422 | } |
421 | catch (WebException e) | 423 | catch (WebException e) |
422 | { | 424 | { |
423 | MainLog.Instance.Warn("GRID", "Error when trying to update_user_friend_perms: " + | 425 | m_log.Warn("[GRID]: Error when trying to update_user_friend_perms: " + |
424 | e.Message); | 426 | e.Message); |
425 | |||
426 | } | 427 | } |
427 | } | 428 | } |
428 | /// <summary> | 429 | /// <summary> |
@@ -452,14 +453,13 @@ namespace OpenSim.Region.Communications.OGS1 | |||
452 | } | 453 | } |
453 | catch (WebException e) | 454 | catch (WebException e) |
454 | { | 455 | { |
455 | MainLog.Instance.Warn("Error when trying to fetch Avatar's friends list: " + | 456 | m_log.Warn("Error when trying to fetch Avatar's friends list: " + |
456 | e.Message); | 457 | e.Message); |
457 | // Return Empty list (no friends) | 458 | // Return Empty list (no friends) |
458 | } | 459 | } |
459 | return buddylist; | 460 | return buddylist; |
460 | |||
461 | } | 461 | } |
462 | 462 | ||
463 | #endregion | 463 | #endregion |
464 | } | 464 | } |
465 | } \ No newline at end of file | 465 | } |