aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-05-26 00:05:35 +0100
committerUbitUmarov2017-05-26 00:05:35 +0100
commitd90b68c2a637b822b826a0cf3c52991aa9ee2c97 (patch)
treeb055c2cf4fe7c68a3773f98ee092077df0f6d85f /OpenSim/Region/Application/OpenSim.cs
parentadd some checks for valid endpoints (diff)
downloadopensim-SC-d90b68c2a637b822b826a0cf3c52991aa9ee2c97.zip
opensim-SC-d90b68c2a637b822b826a0cf3c52991aa9ee2c97.tar.gz
opensim-SC-d90b68c2a637b822b826a0cf3c52991aa9ee2c97.tar.bz2
opensim-SC-d90b68c2a637b822b826a0cf3c52991aa9ee2c97.tar.xz
change wrong watchdog stopped thread check code, and don't log it
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 5977f40..fcc8717 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -511,8 +511,6 @@ namespace OpenSim
511 private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi) 511 private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi)
512 { 512 {
513 int now = Environment.TickCount & Int32.MaxValue; 513 int now = Environment.TickCount & Int32.MaxValue;
514 if(twi.Thread.ThreadState == System.Threading.ThreadState.Stopped)
515 return;
516 m_log.ErrorFormat( 514 m_log.ErrorFormat(
517 "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}", 515 "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}",
518 twi.Thread.Name, 516 twi.Thread.Name,