diff options
author | Melanie | 2010-12-03 07:16:06 +0100 |
---|---|---|
committer | Melanie | 2010-12-03 07:16:06 +0100 |
commit | e913e1690e0e4a8da26103e1159d5ec6aedfb43b (patch) | |
tree | 08d183c19e692e19eb5ef682eb965574f64fe163 | |
parent | Add a missing interface memeber to the new HG stuff (diff) | |
download | opensim-SC-e913e1690e0e4a8da26103e1159d5ec6aedfb43b.zip opensim-SC-e913e1690e0e4a8da26103e1159d5ec6aedfb43b.tar.gz opensim-SC-e913e1690e0e4a8da26103e1159d5ec6aedfb43b.tar.bz2 opensim-SC-e913e1690e0e4a8da26103e1159d5ec6aedfb43b.tar.xz |
Fix health reporting. This will now actually monitor the threads properly
and not just the http server. It will also restart a dead heartbeat.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ae85605..ec1eda0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1213,9 +1213,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1213 | try | 1213 | try |
1214 | { | 1214 | { |
1215 | Update(); | 1215 | Update(); |
1216 | |||
1217 | m_lastUpdate = Util.EnvironmentTickCount(); | ||
1218 | m_firstHeartbeat = false; | ||
1219 | } | 1216 | } |
1220 | catch (ThreadAbortException) | 1217 | catch (ThreadAbortException) |
1221 | { | 1218 | { |
@@ -1405,6 +1402,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1405 | 1402 | ||
1406 | // Tell the watchdog that this thread is still alive | 1403 | // Tell the watchdog that this thread is still alive |
1407 | Watchdog.UpdateThread(); | 1404 | Watchdog.UpdateThread(); |
1405 | |||
1406 | m_lastUpdate = Util.EnvironmentTickCount(); | ||
1407 | m_firstHeartbeat = false; | ||
1408 | } | 1408 | } |
1409 | } | 1409 | } |
1410 | 1410 | ||