aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-04 21:35:12 +0000
committerJustin Clarke Casey2008-11-04 21:35:12 +0000
commite1e2622e923e1e68af710066dc28384660246c9f (patch)
tree01208e0f05a62de356aea2d9f461cfb890151b8e
parent* Stop an exception in the Content Management module main loop from crashing ... (diff)
downloadopensim-SC_OLD-e1e2622e923e1e68af710066dc28384660246c9f.zip
opensim-SC_OLD-e1e2622e923e1e68af710066dc28384660246c9f.tar.gz
opensim-SC_OLD-e1e2622e923e1e68af710066dc28384660246c9f.tar.bz2
opensim-SC_OLD-e1e2622e923e1e68af710066dc28384660246c9f.tar.xz
* Stop an exception in the thread tracker cleanup loop from terminating the sim
-rw-r--r--OpenSim/Framework/ThreadTracker.cs17
1 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index 984acfa..0a63239 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -52,12 +52,21 @@ namespace OpenSim.Framework
52 } 52 }
53 53
54 private static void ThreadTrackerThreadLoop() 54 private static void ThreadTrackerThreadLoop()
55 { 55 {
56 while (true) 56 try
57 { 57 {
58 Thread.Sleep(5000); 58 while (true)
59 CleanUp(); 59 {
60 Thread.Sleep(5000);
61 CleanUp();
62 }
60 } 63 }
64 catch (Exception e)
65 {
66 m_log.ErrorFormat(
67 "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception. Please report this error. Exception is {0}",
68 e);
69 }
61 } 70 }
62 71
63 public static void Add(Thread thread) 72 public static void Add(Thread thread)