OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Force a sim exit when hearbeat isn't restarting successfully

avinationmerge
Melanie 2011-11-17 19:15:11 +01:00
parent df35720cf5
commit e9c386f6a6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -215,6 +215,7 @@ namespace OpenSim.Region.Framework.Scenes
private int m_lastIncoming; private int m_lastIncoming;
private int m_lastOutgoing; private int m_lastOutgoing;
private bool m_firstHeartbeat = true; private bool m_firstHeartbeat = true;
private int m_hbRestarts = 0;
private object m_deleting_scene_object = new object(); private object m_deleting_scene_object = new object();
@ -1166,6 +1167,9 @@ namespace OpenSim.Region.Framework.Scenes
//m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
if (HeartbeatThread != null) if (HeartbeatThread != null)
{ {
m_hbRestarts++;
if(m_hbRestarts > 10)
Environment.Exit(1);
m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
HeartbeatThread.Abort(); HeartbeatThread.Abort();
Watchdog.AbortThread(HeartbeatThread.ManagedThreadId); Watchdog.AbortThread(HeartbeatThread.ManagedThreadId);