aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-07-05 22:17:39 +0100
committerMelanie2012-07-05 22:17:39 +0100
commit5776351f6abd4ca8cca7344b26ab989425c67687 (patch)
treefe0c0355ceb25db47125525b9b72d2077cc3c29f /OpenSim/Services
parentMerge branch 'master' into careminster (diff)
parentminor: add client name to various login service log messages to disambiguate ... (diff)
downloadopensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.zip
opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.tar.gz
opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.tar.bz2
opensim-SC_OLD-5776351f6abd4ca8cca7344b26ab989425c67687.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs56
1 files changed, 43 insertions, 13 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 06e05a9..ed887d9 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -258,7 +258,9 @@ namespace OpenSim.Services.LLLoginService
258 258
259 if (!am.Success) 259 if (!am.Success)
260 { 260 {
261 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client {0} is not allowed", clientVersion); 261 m_log.InfoFormat(
262 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: client {2} is not allowed",
263 firstName, lastName, clientVersion);
262 return LLFailedLoginResponse.LoginBlockedProblem; 264 return LLFailedLoginResponse.LoginBlockedProblem;
263 } 265 }
264 } 266 }
@@ -270,7 +272,9 @@ namespace OpenSim.Services.LLLoginService
270 272
271 if (dm.Success) 273 if (dm.Success)
272 { 274 {
273 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client {0} is denied", clientVersion); 275 m_log.InfoFormat(
276 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: client {2} is denied",
277 firstName, lastName, clientVersion);
274 return LLFailedLoginResponse.LoginBlockedProblem; 278 return LLFailedLoginResponse.LoginBlockedProblem;
275 } 279 }
276 } 280 }
@@ -281,7 +285,8 @@ namespace OpenSim.Services.LLLoginService
281 UserAccount account = m_UserAccountService.GetUserAccount(scopeID, firstName, lastName); 285 UserAccount account = m_UserAccountService.GetUserAccount(scopeID, firstName, lastName);
282 if (account == null) 286 if (account == null)
283 { 287 {
284 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: user not found"); 288 m_log.InfoFormat(
289 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user not found", firstName, lastName);
285 return LLFailedLoginResponse.UserProblem; 290 return LLFailedLoginResponse.UserProblem;
286 } 291 }
287 292
@@ -293,7 +298,9 @@ namespace OpenSim.Services.LLLoginService
293 298
294 if (account.UserLevel < m_MinLoginLevel) 299 if (account.UserLevel < m_MinLoginLevel)
295 { 300 {
296 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: login is blocked for user level {0}", account.UserLevel); 301 m_log.InfoFormat(
302 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: user level is {2} but minimum login level is {3}",
303 firstName, lastName, m_MinLoginLevel, account.UserLevel);
297 return LLFailedLoginResponse.LoginBlockedProblem; 304 return LLFailedLoginResponse.LoginBlockedProblem;
298 } 305 }
299 306
@@ -304,7 +311,8 @@ namespace OpenSim.Services.LLLoginService
304 { 311 {
305 if (account.ScopeID != scopeID && account.ScopeID != UUID.Zero) 312 if (account.ScopeID != scopeID && account.ScopeID != UUID.Zero)
306 { 313 {
307 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: user not found"); 314 m_log.InfoFormat(
315 "[LLOGIN SERVICE]: Login failed, reason: user {0} {1} not found", firstName, lastName);
308 return LLFailedLoginResponse.UserProblem; 316 return LLFailedLoginResponse.UserProblem;
309 } 317 }
310 } 318 }
@@ -323,7 +331,9 @@ namespace OpenSim.Services.LLLoginService
323 UUID secureSession = UUID.Zero; 331 UUID secureSession = UUID.Zero;
324 if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out secureSession))) 332 if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out secureSession)))
325 { 333 {
326 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: authentication failed"); 334 m_log.InfoFormat(
335 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: authentication failed",
336 firstName, lastName);
327 return LLFailedLoginResponse.UserProblem; 337 return LLFailedLoginResponse.UserProblem;
328 } 338 }
329 339
@@ -332,13 +342,18 @@ namespace OpenSim.Services.LLLoginService
332 // 342 //
333 if (m_RequireInventory && m_InventoryService == null) 343 if (m_RequireInventory && m_InventoryService == null)
334 { 344 {
335 m_log.WarnFormat("[LLOGIN SERVICE]: Login failed, reason: inventory service not set up"); 345 m_log.WarnFormat(
346 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: inventory service not set up",
347 firstName, lastName);
336 return LLFailedLoginResponse.InventoryProblem; 348 return LLFailedLoginResponse.InventoryProblem;
337 } 349 }
350
338 List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID); 351 List<InventoryFolderBase> inventorySkel = m_InventoryService.GetInventorySkeleton(account.PrincipalID);
339 if (m_RequireInventory && ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0))) 352 if (m_RequireInventory && ((inventorySkel == null) || (inventorySkel != null && inventorySkel.Count == 0)))
340 { 353 {
341 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: unable to retrieve user inventory"); 354 m_log.InfoFormat(
355 "[LLOGIN SERVICE]: Login failed, for {0} {1}, reason: unable to retrieve user inventory",
356 firstName, lastName);
342 return LLFailedLoginResponse.InventoryProblem; 357 return LLFailedLoginResponse.InventoryProblem;
343 } 358 }
344 359
@@ -352,9 +367,12 @@ namespace OpenSim.Services.LLLoginService
352 if (m_PresenceService != null) 367 if (m_PresenceService != null)
353 { 368 {
354 success = m_PresenceService.LoginAgent(account.PrincipalID.ToString(), session, secureSession); 369 success = m_PresenceService.LoginAgent(account.PrincipalID.ToString(), session, secureSession);
370
355 if (!success) 371 if (!success)
356 { 372 {
357 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: could not login presence"); 373 m_log.InfoFormat(
374 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: could not login presence",
375 firstName, lastName);
358 return LLFailedLoginResponse.GridProblem; 376 return LLFailedLoginResponse.GridProblem;
359 } 377 }
360 } 378 }
@@ -387,9 +405,18 @@ namespace OpenSim.Services.LLLoginService
387 if (destination == null) 405 if (destination == null)
388 { 406 {
389 m_PresenceService.LogoutAgent(session); 407 m_PresenceService.LogoutAgent(session);
390 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: destination not found"); 408
409 m_log.InfoFormat(
410 "[LLOGIN SERVICE]: Login failed for {0} {1}, reason: destination not found",
411 firstName, lastName);
391 return LLFailedLoginResponse.GridProblem; 412 return LLFailedLoginResponse.GridProblem;
392 } 413 }
414 else
415 {
416 m_log.DebugFormat(
417 "[LLOGIN SERVICE]: Found destination {0}, endpoint {1} for {2} {3}",
418 destination.RegionName, destination.ExternalEndPoint, firstName, lastName);
419 }
393 420
394 if (account.UserLevel >= 200) 421 if (account.UserLevel >= 200)
395 flags |= TeleportFlags.Godlike; 422 flags |= TeleportFlags.Godlike;
@@ -413,7 +440,7 @@ namespace OpenSim.Services.LLLoginService
413 if (aCircuit == null) 440 if (aCircuit == null)
414 { 441 {
415 m_PresenceService.LogoutAgent(session); 442 m_PresenceService.LogoutAgent(session);
416 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: {0}", reason); 443 m_log.InfoFormat("[LLOGIN SERVICE]: Login failed for {0} {1}, reason: {2}", firstName, lastName, reason);
417 return new LLFailedLoginResponse("key", reason, "false"); 444 return new LLFailedLoginResponse("key", reason, "false");
418 445
419 } 446 }
@@ -434,7 +461,8 @@ namespace OpenSim.Services.LLLoginService
434 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, 461 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
435 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone); 462 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone);
436 463
437 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 464 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
465
438 return response; 466 return response;
439 } 467 }
440 catch (Exception e) 468 catch (Exception e)
@@ -453,7 +481,9 @@ namespace OpenSim.Services.LLLoginService
453 { 481 {
454 flags = TeleportFlags.ViaLogin; 482 flags = TeleportFlags.ViaLogin;
455 483
456 m_log.DebugFormat("[LLOGIN SERVICE]: FindDestination for start location {0}", startLocation); 484 m_log.DebugFormat(
485 "[LLOGIN SERVICE]: Finding destination matching start location {0} for {1}",
486 startLocation, account.Name);
457 487
458 gatekeeper = null; 488 gatekeeper = null;
459 where = "home"; 489 where = "home";