aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-24 21:10:40 +0100
committerMelanie Thielker2015-11-24 21:10:40 +0100
commit774ac5e96b32e051d3f10d668db1391d82382c1c (patch)
tree447f5224793795be7cfb794a235b70c26e87732f
parent simplify DeliverChatToAvatars(..) ( hopefully not breaking it ) (diff)
downloadopensim-SC-774ac5e96b32e051d3f10d668db1391d82382c1c.zip
opensim-SC-774ac5e96b32e051d3f10d668db1391d82382c1c.tar.gz
opensim-SC-774ac5e96b32e051d3f10d668db1391d82382c1c.tar.bz2
opensim-SC-774ac5e96b32e051d3f10d668db1391d82382c1c.tar.xz
If no job engine is started at all, keep checking it's status from
bombing
-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}