aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-11-25 03:22:20 +0000
committerUbitUmarov2015-11-25 03:22:20 +0000
commit1484348d7f438c117c787c20dcf8de026dd9b5e1 (patch)
tree2b9587daad9d8a7bc73a4a283e752fdd953aa693
parent remove default of 60minutes on MapImageService Refresh time, forgotten from ... (diff)
parentIf no job engine is started at all, keep checking it's status from (diff)
downloadopensim-SC-1484348d7f438c117c787c20dcf8de026dd9b5e1.zip
opensim-SC-1484348d7f438c117c787c20dcf8de026dd9b5e1.tar.gz
opensim-SC-1484348d7f438c117c787c20dcf8de026dd9b5e1.tar.bz2
opensim-SC-1484348d7f438c117c787c20dcf8de026dd9b5e1.tar.xz
Merge branch 'master' of opensimulator.org:/var/git/opensim
-rw-r--r--OpenSim/Framework/Monitoring/JobEngine.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 6db9a67..75ad75d 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Monitoring
76 /// </remarks> 76 /// </remarks>
77 private bool m_warnOverMaxQueue = true; 77 private bool m_warnOverMaxQueue = true;
78 78
79 private BlockingCollection<Job> m_jobQueue; 79 private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
80 80
81 private CancellationTokenSource m_cancelSource; 81 private CancellationTokenSource m_cancelSource;
82 82
@@ -104,7 +104,6 @@ namespace OpenSim.Framework.Monitoring
104 104
105 m_finishedProcessingAfterStop.Reset(); 105 m_finishedProcessingAfterStop.Reset();
106 106
107 m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
108 m_cancelSource = new CancellationTokenSource(); 107 m_cancelSource = new CancellationTokenSource();
109 108
110 WorkManager.StartThread( 109 WorkManager.StartThread(
@@ -338,4 +337,4 @@ namespace OpenSim.Framework.Monitoring
338 } 337 }
339 } 338 }
340 } 339 }
341} \ No newline at end of file 340}