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/Local/LocalLoginService.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/Region/Communications/Local/LocalLoginService.cs')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 12 |
1 files changed, 7 insertions, 5 deletions
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) |