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/Grid/UserServer/MessageServersConnector.cs | |
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 'OpenSim/Grid/UserServer/MessageServersConnector.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/MessageServersConnector.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 93d5925..251644b 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs | |||
@@ -39,15 +39,14 @@ using OpenSim.Framework.Servers; | |||
39 | 39 | ||
40 | namespace OpenSim.Grid.UserServer | 40 | namespace OpenSim.Grid.UserServer |
41 | { | 41 | { |
42 | |||
43 | public class MessageServersConnector | 42 | public class MessageServersConnector |
44 | { | 43 | { |
45 | private LogBase m_log; | 44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | |||
46 | public Dictionary<string, MessageServerInfo> MessageServers; | 46 | public Dictionary<string, MessageServerInfo> MessageServers; |
47 | 47 | ||
48 | public MessageServersConnector(LogBase log) | 48 | public MessageServersConnector() |
49 | { | 49 | { |
50 | m_log=log; | ||
51 | MessageServers = new Dictionary<string, MessageServerInfo>(); | 50 | MessageServers = new Dictionary<string, MessageServerInfo>(); |
52 | } | 51 | } |
53 | 52 | ||
@@ -65,7 +64,7 @@ namespace OpenSim.Grid.UserServer | |||
65 | { | 64 | { |
66 | if (!MessageServers.ContainsKey(URI)) | 65 | if (!MessageServers.ContainsKey(URI)) |
67 | { | 66 | { |
68 | m_log.Warn("MSGSERVER", "Got addResponsibleRegion Request for a MessageServer that isn't registered"); | 67 | m_log.Warn("[MSGSERVER]: Got addResponsibleRegion Request for a MessageServer that isn't registered"); |
69 | } | 68 | } |
70 | else | 69 | else |
71 | { | 70 | { |
@@ -78,7 +77,7 @@ namespace OpenSim.Grid.UserServer | |||
78 | { | 77 | { |
79 | if (!MessageServers.ContainsKey(URI)) | 78 | if (!MessageServers.ContainsKey(URI)) |
80 | { | 79 | { |
81 | m_log.Warn("MSGSERVER", "Got RemoveResponsibleRegion Request for a MessageServer that isn't registered"); | 80 | m_log.Warn("[MSGSERVER]: Got RemoveResponsibleRegion Request for a MessageServer that isn't registered"); |
82 | } | 81 | } |
83 | else | 82 | else |
84 | { | 83 | { |
@@ -175,10 +174,7 @@ namespace OpenSim.Grid.UserServer | |||
175 | 174 | ||
176 | XmlRpcRequest GridReq = new XmlRpcRequest("login_to_simulator", SendParams); | 175 | XmlRpcRequest GridReq = new XmlRpcRequest("login_to_simulator", SendParams); |
177 | XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); | 176 | XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000); |
178 | m_log.Verbose("LOGIN","Notified : " + serv.URI + " about user login"); | 177 | m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login"); |
179 | |||
180 | } | 178 | } |
181 | |||
182 | |||
183 | } | 179 | } |
184 | } | 180 | } |