diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ad2192d..bfabcc2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1171,8 +1171,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1171 | if(m_hbRestarts > 10) | 1171 | if(m_hbRestarts > 10) |
1172 | Environment.Exit(1); | 1172 | Environment.Exit(1); |
1173 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); | 1173 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); |
1174 | int pid = System.Diagnostics.Process.GetCurrentProcess().Id; | 1174 | |
1175 | 1175 | //int pid = System.Diagnostics.Process.GetCurrentProcess().Id; | |
1176 | //System.Diagnostics.Process proc = new System.Diagnostics.Process(); | 1176 | //System.Diagnostics.Process proc = new System.Diagnostics.Process(); |
1177 | //proc.EnableRaisingEvents=false; | 1177 | //proc.EnableRaisingEvents=false; |
1178 | //proc.StartInfo.FileName = "/bin/kill"; | 1178 | //proc.StartInfo.FileName = "/bin/kill"; |
@@ -4630,6 +4630,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
4630 | health+=1; | 4630 | health+=1; |
4631 | flags |= 4; | 4631 | flags |= 4; |
4632 | } | 4632 | } |
4633 | else | ||
4634 | { | ||
4635 | int pid = System.Diagnostics.Process.GetCurrentProcess().Id; | ||
4636 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); | ||
4637 | proc.EnableRaisingEvents=false; | ||
4638 | proc.StartInfo.FileName = "/bin/kill"; | ||
4639 | proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); | ||
4640 | proc.Start(); | ||
4641 | proc.WaitForExit(); | ||
4642 | Thread.Sleep(1000); | ||
4643 | Environment.Exit(1); | ||
4644 | } | ||
4633 | 4645 | ||
4634 | if (flags != 7) | 4646 | if (flags != 7) |
4635 | return health; | 4647 | return health; |