diff options
author | Justin Clark-Casey (justincc) | 2011-11-12 00:24:45 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-12 00:24:45 +0000 |
commit | f130e1a86f2e00abf4e77403858814219bffd3bb (patch) | |
tree | 4f8e71c5232ff79e855c7c0edf5f7b7196d5f01c /OpenSim | |
parent | Make log messages on authentication failure more explicit (diff) | |
download | opensim-SC-f130e1a86f2e00abf4e77403858814219bffd3bb.zip opensim-SC-f130e1a86f2e00abf4e77403858814219bffd3bb.tar.gz opensim-SC-f130e1a86f2e00abf4e77403858814219bffd3bb.tar.bz2 opensim-SC-f130e1a86f2e00abf4e77403858814219bffd3bb.tar.xz |
Add threads to the watchdog thread list before we start them.
Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Watchdog.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 5ffa890..3a40d0e 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
@@ -122,6 +122,11 @@ namespace OpenSim.Framework | |||
122 | public static Thread StartThread( | 122 | public static Thread StartThread( |
123 | ThreadStart start, string name, ThreadPriority priority, bool isBackground, int timeout) | 123 | ThreadStart start, string name, ThreadPriority priority, bool isBackground, int timeout) |
124 | { | 124 | { |
125 | m_log.Debug("[WATCHDOG]: Started tracking thread \"" + twi.Thread.Name + "\" (ID " + twi.Thread.ManagedThreadId + ")"); | ||
126 | |||
127 | lock (m_threads) | ||
128 | m_threads.Add(twi.Thread.ManagedThreadId, twi); | ||
129 | |||
125 | Thread thread = new Thread(start); | 130 | Thread thread = new Thread(start); |
126 | thread.Name = name; | 131 | thread.Name = name; |
127 | thread.Priority = priority; | 132 | thread.Priority = priority; |
@@ -130,11 +135,6 @@ namespace OpenSim.Framework | |||
130 | 135 | ||
131 | ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout); | 136 | ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout); |
132 | 137 | ||
133 | m_log.Debug("[WATCHDOG]: Started tracking thread \"" + twi.Thread.Name + "\" (ID " + twi.Thread.ManagedThreadId + ")"); | ||
134 | |||
135 | lock (m_threads) | ||
136 | m_threads.Add(twi.Thread.ManagedThreadId, twi); | ||
137 | |||
138 | return thread; | 138 | return thread; |
139 | } | 139 | } |
140 | 140 | ||