Fix health reporting. This will now actually monitor the threads properly
and not just the http server. It will also restart a dead heartbeat.avinationmerge
parent
ce1aedf474
commit
e913e1690e
|
@ -1213,9 +1213,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Update();
|
Update();
|
||||||
|
|
||||||
m_lastUpdate = Util.EnvironmentTickCount();
|
|
||||||
m_firstHeartbeat = false;
|
|
||||||
}
|
}
|
||||||
catch (ThreadAbortException)
|
catch (ThreadAbortException)
|
||||||
{
|
{
|
||||||
|
@ -1405,6 +1402,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
// Tell the watchdog that this thread is still alive
|
// Tell the watchdog that this thread is still alive
|
||||||
Watchdog.UpdateThread();
|
Watchdog.UpdateThread();
|
||||||
|
|
||||||
|
m_lastUpdate = Util.EnvironmentTickCount();
|
||||||
|
m_firstHeartbeat = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue