diff options
author | Melanie Thielker | 2008-10-10 01:10:33 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-10 01:10:33 +0000 |
commit | 96689723e5002075b45d01fe4243bf2d87d916b4 (patch) | |
tree | 5d8f9b35097da6657493db7b01738d55647dd31d /OpenSim/Region/Environment/Scenes | |
parent | Fixed renaming of in-prim items (Mantis #2366) (diff) | |
download | opensim-SC-96689723e5002075b45d01fe4243bf2d87d916b4.zip opensim-SC-96689723e5002075b45d01fe4243bf2d87d916b4.tar.gz opensim-SC-96689723e5002075b45d01fe4243bf2d87d916b4.tar.bz2 opensim-SC-96689723e5002075b45d01fe4243bf2d87d916b4.tar.xz |
Add the beginnings of a sim health check (through remote admin)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 27c315c..8bd3642 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -168,6 +168,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
168 | private bool m_physics_enabled = true; | 168 | private bool m_physics_enabled = true; |
169 | private bool m_scripts_enabled = true; | 169 | private bool m_scripts_enabled = true; |
170 | private string m_defaultScriptEngine; | 170 | private string m_defaultScriptEngine; |
171 | private int m_LastLogin = 0; | ||
171 | 172 | ||
172 | #endregion | 173 | #endregion |
173 | 174 | ||
@@ -2142,6 +2143,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2142 | 2143 | ||
2143 | CreateAndAddScenePresence(client, child); | 2144 | CreateAndAddScenePresence(client, child); |
2144 | } | 2145 | } |
2146 | m_LastLogin = System.Environment.TickCount; | ||
2145 | EventManager.TriggerOnNewClient(client); | 2147 | EventManager.TriggerOnNewClient(client); |
2146 | } | 2148 | } |
2147 | 2149 | ||
@@ -4258,5 +4260,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
4258 | { | 4260 | { |
4259 | m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); | 4261 | m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); |
4260 | } | 4262 | } |
4263 | |||
4264 | public int GetHealth() | ||
4265 | { | ||
4266 | int health=1; // Start at 1, means we're up | ||
4267 | |||
4268 | // A login in the last 4 mins? We can't be doing too badly | ||
4269 | // | ||
4270 | if ((System.Environment.TickCount - m_LastLogin) < 240000) | ||
4271 | health++; | ||
4272 | |||
4273 | return 0; | ||
4274 | } | ||
4261 | } | 4275 | } |
4262 | } | 4276 | } |