diff options
| author | Oren Hurvitz | 2014-03-26 21:31:16 +0200 |
|---|---|---|
| committer | Oren Hurvitz | 2014-03-26 20:34:55 +0100 |
| commit | 7a47c15edbbebd93fc3355dfed68c2d5f635c897 (patch) | |
| tree | 451e9121a86b6bcf9cf02855049f442d7bd5a866 /OpenSim/Framework | |
| parent | Revert "Use log-rolling on the log files (once per day)" (diff) | |
| download | opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.zip opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.gz opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.bz2 opensim-SC_OLD-7a47c15edbbebd93fc3355dfed68c2d5f635c897.tar.xz | |
- Increased the threadpool timeout to 10 minutes
- Changed a few places that launch long-lasting threads to skip the timeout altogether
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index ce4af8b..c7a7341 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2031,7 +2031,7 @@ namespace OpenSim.Framework | |||
| 2031 | // Maps (ThreadFunc number -> Thread) | 2031 | // Maps (ThreadFunc number -> Thread) |
| 2032 | private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>(); | 2032 | private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>(); |
| 2033 | 2033 | ||
| 2034 | private static readonly int THREAD_TIMEOUT = 60 * 1000; | 2034 | private static readonly int THREAD_TIMEOUT = 10 * 60 * 1000; // 10 minutes |
| 2035 | 2035 | ||
| 2036 | /// <summary> | 2036 | /// <summary> |
| 2037 | /// Finds threads in the main thread pool that have timed-out, and aborts them. | 2037 | /// Finds threads in the main thread pool that have timed-out, and aborts them. |