aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2017-05-23 06:38:19 +0100
committerUbitUmarov2017-05-23 06:38:19 +0100
commit07e614a32c79b9295b162119d95ab1770243a8cc (patch)
tree27f78db8119a2b30853c9b4f6b8b91df5ec7394b /OpenSim/Region
parent fix lock position removing a not necessary function (diff)
downloadopensim-SC_OLD-07e614a32c79b9295b162119d95ab1770243a8cc.zip
opensim-SC_OLD-07e614a32c79b9295b162119d95ab1770243a8cc.tar.gz
opensim-SC_OLD-07e614a32c79b9295b162119d95ab1770243a8cc.tar.bz2
opensim-SC_OLD-07e614a32c79b9295b162119d95ab1770243a8cc.tar.xz
dont log timeouts on stopped threads
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index f9f103a..524f2be 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -504,7 +504,8 @@ namespace OpenSim
504 private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi) 504 private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi)
505 { 505 {
506 int now = Environment.TickCount & Int32.MaxValue; 506 int now = Environment.TickCount & Int32.MaxValue;
507 507 if(twi.Thread.ThreadState == System.Threading.ThreadState.Stopped)
508 return;
508 m_log.ErrorFormat( 509 m_log.ErrorFormat(
509 "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}", 510 "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}",
510 twi.Thread.Name, 511 twi.Thread.Name,