From 67407024a2e0b6e27f526cc2312e93fd867a855b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:29:19 +0100
Subject: Update thread watchdog on GridServiceRequestThread periodically and
 turn off alarming

Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
---
 .../Framework/GridServiceThrottle/GridServiceThrottleModule.cs        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index a662731..f1eb1ad 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 "GridServiceRequestThread",
                 ThreadPriority.BelowNormal,
                 true,
-                true);
+                false);
         }
 
         public void AddRegion(Scene scene)
@@ -137,6 +137,8 @@ namespace OpenSim.Region.CoreModules.Framework
         {
             while (true)
             {
+                Watchdog.UpdateThread();
+
                 GridRegionRequest request = m_RequestQueue.Dequeue();
                 GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
 
-- 
cgit v1.1