diff options
author | Justin Clark-Casey (justincc) | 2011-12-09 23:21:54 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-09 23:21:54 +0000 |
commit | 13b1c8c1730147a0c7cf1a0a0039ed493e1cbb29 (patch) | |
tree | 45042f0f10a2152a892cc1a7182bb15f08cc5c4a /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ... (diff) | |
download | opensim-SC_OLD-13b1c8c1730147a0c7cf1a0a0039ed493e1cbb29.zip opensim-SC_OLD-13b1c8c1730147a0c7cf1a0a0039ed493e1cbb29.tar.gz opensim-SC_OLD-13b1c8c1730147a0c7cf1a0a0039ed493e1cbb29.tar.bz2 opensim-SC_OLD-13b1c8c1730147a0c7cf1a0a0039ed493e1cbb29.tar.xz |
Do some clean up Scene.cs log messages.
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 62 |
1 files changed, 38 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9fdf395..85debc4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -760,7 +760,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
760 | } | 760 | } |
761 | } | 761 | } |
762 | 762 | ||
763 | m_log.Info("[SCENE]: Using the " + m_priorityScheme + " prioritization scheme"); | 763 | m_log.InfoFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme); |
764 | 764 | ||
765 | #endregion Interest Management | 765 | #endregion Interest Management |
766 | 766 | ||
@@ -891,9 +891,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
891 | } | 891 | } |
892 | else | 892 | else |
893 | { | 893 | { |
894 | m_log.Info("[INTERGRID]: Got notice about far away Region: " + otherRegion.RegionName.ToString() + | 894 | m_log.InfoFormat( |
895 | " at (" + otherRegion.RegionLocX.ToString() + ", " + | 895 | "[INTERGRID]: Got notice about far away Region: {0} at ({1}, {2})", |
896 | otherRegion.RegionLocY.ToString() + ")"); | 896 | otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); |
897 | } | 897 | } |
898 | } | 898 | } |
899 | } | 899 | } |
@@ -1368,7 +1368,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1368 | } | 1368 | } |
1369 | catch (AccessViolationException e) | 1369 | catch (AccessViolationException e) |
1370 | { | 1370 | { |
1371 | m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1371 | m_log.ErrorFormat( |
1372 | "[REGION]: Failed on region {0} with exception {1}{2}", | ||
1373 | RegionInfo.RegionName, e.Message, e.StackTrace); | ||
1372 | } | 1374 | } |
1373 | //catch (NullReferenceException e) | 1375 | //catch (NullReferenceException e) |
1374 | //{ | 1376 | //{ |
@@ -1376,11 +1378,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
1376 | //} | 1378 | //} |
1377 | catch (InvalidOperationException e) | 1379 | catch (InvalidOperationException e) |
1378 | { | 1380 | { |
1379 | m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1381 | m_log.ErrorFormat( |
1382 | "[REGION]: Failed on region {0} with exception {1}{2}", | ||
1383 | RegionInfo.RegionName, e.Message, e.StackTrace); | ||
1380 | } | 1384 | } |
1381 | catch (Exception e) | 1385 | catch (Exception e) |
1382 | { | 1386 | { |
1383 | m_log.Error("[REGION]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName); | 1387 | m_log.ErrorFormat( |
1388 | "[REGION]: Failed on region {0} with exception {1}{2}", | ||
1389 | RegionInfo.RegionName, e.Message, e.StackTrace); | ||
1384 | } | 1390 | } |
1385 | 1391 | ||
1386 | maintc = Util.EnvironmentTickCountSubtract(maintc); | 1392 | maintc = Util.EnvironmentTickCountSubtract(maintc); |
@@ -1602,7 +1608,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1602 | } | 1608 | } |
1603 | catch (IOException e) | 1609 | catch (IOException e) |
1604 | { | 1610 | { |
1605 | m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); | 1611 | m_log.WarnFormat( |
1612 | "[TERRAIN]: Scene.cs: LoadWorldMap() - Regenerating as failed with exception {0}{1}", | ||
1613 | e.Message, e.StackTrace); | ||
1606 | 1614 | ||
1607 | // Non standard region size. If there's an old terrain in the database, it might read past the buffer | 1615 | // Non standard region size. If there's an old terrain in the database, it might read past the buffer |
1608 | #pragma warning disable 0162 | 1616 | #pragma warning disable 0162 |
@@ -1615,7 +1623,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1615 | } | 1623 | } |
1616 | catch (Exception e) | 1624 | catch (Exception e) |
1617 | { | 1625 | { |
1618 | m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString()); | 1626 | m_log.WarnFormat( |
1627 | "[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception {0}{1}", e.Message, e.StackTrace); | ||
1619 | } | 1628 | } |
1620 | } | 1629 | } |
1621 | 1630 | ||
@@ -1689,7 +1698,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1689 | 1698 | ||
1690 | List<SceneObjectGroup> PrimsFromDB = SimulationDataService.LoadObjects(regionID); | 1699 | List<SceneObjectGroup> PrimsFromDB = SimulationDataService.LoadObjects(regionID); |
1691 | 1700 | ||
1692 | m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count + " objects from the datastore"); | 1701 | m_log.InfoFormat("[SCENE]: Loaded {0} objects from the datastore", PrimsFromDB.Count); |
1693 | 1702 | ||
1694 | foreach (SceneObjectGroup group in PrimsFromDB) | 1703 | foreach (SceneObjectGroup group in PrimsFromDB) |
1695 | { | 1704 | { |
@@ -1703,7 +1712,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1703 | // group.CheckSculptAndLoad(); | 1712 | // group.CheckSculptAndLoad(); |
1704 | } | 1713 | } |
1705 | 1714 | ||
1706 | m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); | ||
1707 | LoadingPrims = false; | 1715 | LoadingPrims = false; |
1708 | EventManager.TriggerPrimsLoaded(this); | 1716 | EventManager.TriggerPrimsLoaded(this); |
1709 | } | 1717 | } |
@@ -2326,7 +2334,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2326 | } | 2334 | } |
2327 | catch (Exception e) | 2335 | catch (Exception e) |
2328 | { | 2336 | { |
2329 | m_log.WarnFormat("[SCENE]: Problem casting object: " + e.ToString()); | 2337 | m_log.WarnFormat("[SCENE]: Problem casting object, exception {0}{1}", e.Message, e.StackTrace); |
2330 | return false; | 2338 | return false; |
2331 | } | 2339 | } |
2332 | 2340 | ||
@@ -2402,8 +2410,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2402 | // | 2410 | // |
2403 | if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID)) | 2411 | if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID)) |
2404 | { | 2412 | { |
2405 | m_log.Info("[INTERREGION]: Denied prim crossing for " + | 2413 | m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID); |
2406 | "banned avatar"); | ||
2407 | 2414 | ||
2408 | return false; | 2415 | return false; |
2409 | } | 2416 | } |
@@ -2460,8 +2467,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2460 | { | 2467 | { |
2461 | // Deny non attachments based on parcel settings | 2468 | // Deny non attachments based on parcel settings |
2462 | // | 2469 | // |
2463 | m_log.Info("[INTERREGION]: Denied prim crossing " + | 2470 | m_log.Info("[INTERREGION]: Denied prim crossing because of parcel settings"); |
2464 | "because of parcel settings"); | ||
2465 | 2471 | ||
2466 | DeleteSceneObject(sceneObject, false); | 2472 | DeleteSceneObject(sceneObject, false); |
2467 | 2473 | ||
@@ -2505,7 +2511,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2505 | // connected. | 2511 | // connected. |
2506 | if (sp == null) | 2512 | if (sp == null) |
2507 | { | 2513 | { |
2508 | m_log.Debug("[SCENE]: Adding new child scene presence " + client.Name + " to scene " + RegionInfo.RegionName); | 2514 | m_log.DebugFormat( |
2515 | "[SCENE]: Adding new child scene presence {0} to scene {1}", client.Name, RegionInfo.RegionName); | ||
2509 | 2516 | ||
2510 | m_clientManager.Add(client); | 2517 | m_clientManager.Add(client); |
2511 | SubscribeToClientEvents(client); | 2518 | SubscribeToClientEvents(client); |
@@ -3141,7 +3148,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3141 | } | 3148 | } |
3142 | catch (Exception e) | 3149 | catch (Exception e) |
3143 | { | 3150 | { |
3144 | m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString()); | 3151 | m_log.ErrorFormat("[SCENE] Scene.cs:RemoveClient exception {0}{1}", e.Message, e.StackTrace); |
3145 | } | 3152 | } |
3146 | 3153 | ||
3147 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); | 3154 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); |
@@ -3286,7 +3293,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3286 | } | 3293 | } |
3287 | catch (Exception e) | 3294 | catch (Exception e) |
3288 | { | 3295 | { |
3289 | m_log.ErrorFormat("[CONNECTION BEGIN]: Exception verifying presence " + e.ToString()); | 3296 | m_log.ErrorFormat( |
3297 | "[CONNECTION BEGIN]: Exception verifying presence {0}{1}", e.Message, e.StackTrace); | ||
3290 | return false; | 3298 | return false; |
3291 | } | 3299 | } |
3292 | } | 3300 | } |
@@ -3298,7 +3306,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3298 | } | 3306 | } |
3299 | catch (Exception e) | 3307 | catch (Exception e) |
3300 | { | 3308 | { |
3301 | m_log.ErrorFormat("[CONNECTION BEGIN]: Exception authorizing user " + e.ToString()); | 3309 | m_log.ErrorFormat( |
3310 | "[CONNECTION BEGIN]: Exception authorizing user {0}{1}", e.Message, e.StackTrace); | ||
3302 | return false; | 3311 | return false; |
3303 | } | 3312 | } |
3304 | 3313 | ||
@@ -3509,7 +3518,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3509 | } | 3518 | } |
3510 | } | 3519 | } |
3511 | else | 3520 | else |
3521 | { | ||
3512 | m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!"); | 3522 | m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!"); |
3523 | } | ||
3513 | 3524 | ||
3514 | IGroupsModule groupsModule = | 3525 | IGroupsModule groupsModule = |
3515 | RequestModuleInterface<IGroupsModule>(); | 3526 | RequestModuleInterface<IGroupsModule>(); |
@@ -3527,7 +3538,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3527 | agentGroups.Add(GroupMembership[i].GroupID); | 3538 | agentGroups.Add(GroupMembership[i].GroupID); |
3528 | } | 3539 | } |
3529 | else | 3540 | else |
3541 | { | ||
3530 | m_log.ErrorFormat("[CONNECTION BEGIN]: GroupMembership is null!"); | 3542 | m_log.ErrorFormat("[CONNECTION BEGIN]: GroupMembership is null!"); |
3543 | } | ||
3531 | } | 3544 | } |
3532 | 3545 | ||
3533 | bool groupAccess = false; | 3546 | bool groupAccess = false; |
@@ -3545,7 +3558,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3545 | } | 3558 | } |
3546 | } | 3559 | } |
3547 | else | 3560 | else |
3561 | { | ||
3548 | m_log.ErrorFormat("[CONNECTION BEGIN]: EstateGroups is null!"); | 3562 | m_log.ErrorFormat("[CONNECTION BEGIN]: EstateGroups is null!"); |
3563 | } | ||
3549 | 3564 | ||
3550 | if (!m_regInfo.EstateSettings.PublicAccess && | 3565 | if (!m_regInfo.EstateSettings.PublicAccess && |
3551 | !m_regInfo.EstateSettings.HasAccess(agent.AgentID) && | 3566 | !m_regInfo.EstateSettings.HasAccess(agent.AgentID) && |
@@ -3662,7 +3677,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3662 | } | 3677 | } |
3663 | catch (Exception e) | 3678 | catch (Exception e) |
3664 | { | 3679 | { |
3665 | m_log.ErrorFormat("[SCENE]: Unable to do agent crossing, exception {0}", e); | 3680 | m_log.ErrorFormat("[SCENE]: Unable to do agent crossing, exception {0}{1}", e.Message, e.StackTrace); |
3666 | } | 3681 | } |
3667 | } | 3682 | } |
3668 | else | 3683 | else |
@@ -3968,7 +3983,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3968 | /// <param name="cmdparams"></param> | 3983 | /// <param name="cmdparams"></param> |
3969 | public void HandleEditCommand(string[] cmdparams) | 3984 | public void HandleEditCommand(string[] cmdparams) |
3970 | { | 3985 | { |
3971 | m_log.Debug("Searching for Primitive: '" + cmdparams[2] + "'"); | 3986 | m_log.DebugFormat("Searching for Primitive: '{0}'", cmdparams[2]); |
3972 | 3987 | ||
3973 | EntityBase[] entityList = GetEntities(); | 3988 | EntityBase[] entityList = GetEntities(); |
3974 | foreach (EntityBase ent in entityList) | 3989 | foreach (EntityBase ent in entityList) |
@@ -3984,7 +3999,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3984 | new Vector3(Convert.ToSingle(cmdparams[3]), Convert.ToSingle(cmdparams[4]), | 3999 | new Vector3(Convert.ToSingle(cmdparams[3]), Convert.ToSingle(cmdparams[4]), |
3985 | Convert.ToSingle(cmdparams[5]))); | 4000 | Convert.ToSingle(cmdparams[5]))); |
3986 | 4001 | ||
3987 | m_log.Debug("Edited scale of Primitive: " + part.Name); | 4002 | m_log.DebugFormat("Edited scale of Primitive: {0}", part.Name); |
3988 | } | 4003 | } |
3989 | } | 4004 | } |
3990 | } | 4005 | } |
@@ -4013,7 +4028,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4013 | return LandChannel.GetLandObject((int)x, (int)y).LandData; | 4028 | return LandChannel.GetLandObject((int)x, (int)y).LandData; |
4014 | } | 4029 | } |
4015 | 4030 | ||
4016 | |||
4017 | #endregion | 4031 | #endregion |
4018 | 4032 | ||
4019 | #region Script Engine | 4033 | #region Script Engine |