aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-05-28 09:15:24 +0200
committerMelanie2012-05-28 09:15:24 +0200
commitca3b229e941512b3d05793f9fbbede7702eeeb38 (patch)
tree5acde8a5e75e42402de1364b7e12e5fa4325b346
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC_OLD-ca3b229e941512b3d05793f9fbbede7702eeeb38.zip
opensim-SC_OLD-ca3b229e941512b3d05793f9fbbede7702eeeb38.tar.gz
opensim-SC_OLD-ca3b229e941512b3d05793f9fbbede7702eeeb38.tar.bz2
opensim-SC_OLD-ca3b229e941512b3d05793f9fbbede7702eeeb38.tar.xz
If a region is not found on a simulator, make the health query return
0 to indicate it's still starting rather than an error. There are other methods that can discover the presence of a region and slow starting regions may cause the watchdog to kill them while they start,
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs17
1 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 49a8e64..9e72a98 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1673,16 +1673,25 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1673 Hashtable responseData = (Hashtable)response.Value; 1673 Hashtable responseData = (Hashtable)response.Value;
1674 Hashtable requestData = (Hashtable)request.Params[0]; 1674 Hashtable requestData = (Hashtable)request.Params[0];
1675 1675
1676 int flags = 0;
1677 string text = String.Empty;
1678 int health = 0;
1676 responseData["success"] = true; 1679 responseData["success"] = true;
1677 1680
1678 CheckRegionParams(requestData, responseData); 1681 CheckRegionParams(requestData, responseData);
1679 1682
1680 Scene scene = null; 1683 Scene scene = null;
1681 GetSceneFromRegionParams(requestData, responseData, out scene); 1684 try
1685 {
1686 GetSceneFromRegionParams(requestData, responseData, out scene);
1687 health = scene.GetHealth(out flags, out text);
1688 }
1689 catch (Exception e)
1690 {
1691 responseData["error"] = null;
1692 }
1682 1693
1683 int flags; 1694 responseData["success"] = true;
1684 string text;
1685 int health = scene.GetHealth(out flags, out text);
1686 responseData["health"] = health; 1695 responseData["health"] = health;
1687 responseData["flags"] = flags; 1696 responseData["flags"] = flags;
1688 responseData["message"] = text; 1697 responseData["message"] = text;