diff options
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 10 | ||||
-rw-r--r-- | OpenSim/Services/FSAssetService/FSAssetService.cs | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | OpenSim/Services/GridService/GridService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/PresenceService/PresenceService.cs | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 0204699..aef3e9f 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -87,6 +87,7 @@ namespace OpenSim.Services.AuthenticationService | |||
87 | if (!data.Data.ContainsKey("passwordHash") || | 87 | if (!data.Data.ContainsKey("passwordHash") || |
88 | !data.Data.ContainsKey("passwordSalt")) | 88 | !data.Data.ContainsKey("passwordSalt")) |
89 | { | 89 | { |
90 | m_log.DebugFormat("[AUTH SERVICE]: No credentials."); | ||
90 | return String.Empty; | 91 | return String.Empty; |
91 | } | 92 | } |
92 | 93 | ||
@@ -109,9 +110,12 @@ namespace OpenSim.Services.AuthenticationService | |||
109 | int impersonateFlag = 1 << 6; | 110 | int impersonateFlag = 1 << 6; |
110 | 111 | ||
111 | if ((user.UserFlags & impersonateFlag) == 0) | 112 | if ((user.UserFlags & impersonateFlag) == 0) |
113 | { | ||
114 | m_log.DebugFormat("[AUTH SERVICE]: Not trying impersonation {0} {1}.", user.UserFlags, impersonateFlag); | ||
112 | return String.Empty; | 115 | return String.Empty; |
116 | } | ||
113 | 117 | ||
114 | m_log.DebugFormat("[PASS AUTH]: Attempting impersonation"); | 118 | m_log.DebugFormat("[PASS AUTH]: Attempting impersonation."); |
115 | 119 | ||
116 | List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); | 120 | List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); |
117 | if (accounts == null || accounts.Count == 0) | 121 | if (accounts == null || accounts.Count == 0) |
@@ -134,7 +138,7 @@ namespace OpenSim.Services.AuthenticationService | |||
134 | 138 | ||
135 | if (data.Data["passwordHash"].ToString() == hashed) | 139 | if (data.Data["passwordHash"].ToString() == hashed) |
136 | { | 140 | { |
137 | m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); | 141 | m_log.InfoFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); |
138 | realID = a.PrincipalID; | 142 | realID = a.PrincipalID; |
139 | return GetToken(principalID, lifetime); | 143 | return GetToken(principalID, lifetime); |
140 | } | 144 | } |
@@ -146,7 +150,7 @@ namespace OpenSim.Services.AuthenticationService | |||
146 | // } | 150 | // } |
147 | } | 151 | } |
148 | 152 | ||
149 | m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); | 153 | m_log.InfoFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); |
150 | return String.Empty; | 154 | return String.Empty; |
151 | } | 155 | } |
152 | } | 156 | } |
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index 2fb3e6c..d1a59d1 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs | |||
@@ -178,6 +178,7 @@ namespace OpenSim.Services.FSAssetService | |||
178 | Directory.CreateDirectory(spoolTmp); | 178 | Directory.CreateDirectory(spoolTmp); |
179 | 179 | ||
180 | m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); | 180 | m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); |
181 | m_log.InfoFormat("[FSASSETS]: Assets base and spool directory are {0} and {1}", m_FSBase, m_SpoolDirectory); | ||
181 | if (m_FSBase == String.Empty) | 182 | if (m_FSBase == String.Empty) |
182 | { | 183 | { |
183 | m_log.ErrorFormat("[FSASSETS]: BaseDirectory not specified"); | 184 | m_log.ErrorFormat("[FSASSETS]: BaseDirectory not specified"); |
@@ -230,7 +231,7 @@ namespace OpenSim.Services.FSAssetService | |||
230 | double avg = (double)m_readTicks / (double)m_readCount; | 231 | double avg = (double)m_readTicks / (double)m_readCount; |
231 | // if (avg > 10000) | 232 | // if (avg > 10000) |
232 | // Environment.Exit(0); | 233 | // Environment.Exit(0); |
233 | m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); | 234 | //// m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); |
234 | } | 235 | } |
235 | m_readCount = 0; | 236 | m_readCount = 0; |
236 | m_readTicks = 0; | 237 | m_readTicks = 0; |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index d8f3720..b42cfb1 100755..100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -345,7 +345,7 @@ namespace OpenSim.Services.GridService | |||
345 | m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); | 345 | m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); |
346 | } | 346 | } |
347 | 347 | ||
348 | m_log.DebugFormat | 348 | m_log.InfoFormat |
349 | ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", | 349 | ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", |
350 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, | 350 | regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, |
351 | regionInfos.RegionCoordX, regionInfos.RegionCoordY, | 351 | regionInfos.RegionCoordX, regionInfos.RegionCoordY, |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.GridService | |||
374 | if (region == null) | 374 | if (region == null) |
375 | return false; | 375 | return false; |
376 | 376 | ||
377 | m_log.DebugFormat( | 377 | m_log.InfoFormat( |
378 | "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}", | 378 | "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}", |
379 | region.RegionName, region.RegionID, region.coordX, region.coordY); | 379 | region.RegionName, region.RegionID, region.coordX, region.coordY); |
380 | 380 | ||
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index ae92919..1539d5b 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Services.PresenceService | |||
88 | { | 88 | { |
89 | PresenceInfo presence = GetAgent(sessionID); | 89 | PresenceInfo presence = GetAgent(sessionID); |
90 | 90 | ||
91 | m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", | 91 | m_log.InfoFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", |
92 | sessionID, | 92 | sessionID, |
93 | (presence == null) ? null : presence.UserID, | 93 | (presence == null) ? null : presence.UserID, |
94 | (presence == null) ? null : presence.RegionID.ToString()); | 94 | (presence == null) ? null : presence.RegionID.ToString()); |
@@ -198,4 +198,4 @@ namespace OpenSim.Services.PresenceService | |||
198 | } | 198 | } |
199 | 199 | ||
200 | } | 200 | } |
201 | } \ No newline at end of file | 201 | } |