From afab4b276ebc87f70307ac65e158bb3489d7634b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Dec 2011 13:51:31 +0100
Subject: Remove spammy log messages when querying sim health

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

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
                 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);
-                int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
-                
+
+//int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
 //System.Diagnostics.Process proc = new System.Diagnostics.Process();
 //proc.EnableRaisingEvents=false; 
 //proc.StartInfo.FileName = "/bin/kill";
@@ -4630,6 +4630,18 @@ namespace OpenSim.Region.Framework.Scenes
                 health+=1;
                 flags |= 4;
             }
+            else
+            {
+int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
+System.Diagnostics.Process proc = new System.Diagnostics.Process();
+proc.EnableRaisingEvents=false; 
+proc.StartInfo.FileName = "/bin/kill";
+proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
+proc.Start();
+proc.WaitForExit();
+Thread.Sleep(1000);
+Environment.Exit(1);
+            }
 
             if (flags != 7)
                 return health;
-- 
cgit v1.1