diff options
Diffstat (limited to 'OpenSim/Framework/Monitoring')
-rw-r--r-- | OpenSim/Framework/Monitoring/JobEngine.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Monitoring/Stats/Stat.cs | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs index 115871e..6c388b3 100644 --- a/OpenSim/Framework/Monitoring/JobEngine.cs +++ b/OpenSim/Framework/Monitoring/JobEngine.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring | |||
79 | /// </remarks> | 79 | /// </remarks> |
80 | private bool m_warnOverMaxQueue = true; | 80 | private bool m_warnOverMaxQueue = true; |
81 | 81 | ||
82 | private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000); | 82 | private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(5000); |
83 | 83 | ||
84 | private CancellationTokenSource m_cancelSource; | 84 | private CancellationTokenSource m_cancelSource; |
85 | 85 | ||
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Monitoring | |||
238 | break; | 238 | break; |
239 | } | 239 | } |
240 | } | 240 | } |
241 | catch(ObjectDisposedException e) | 241 | catch(ObjectDisposedException) |
242 | { | 242 | { |
243 | m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue", | 243 | m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue", |
244 | Name,m_jobQueue.Count); | 244 | Name,m_jobQueue.Count); |
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs index 2402acd..4b1a229 100644 --- a/OpenSim/Framework/Monitoring/Stats/Stat.cs +++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs | |||
@@ -242,11 +242,7 @@ namespace OpenSim.Framework.Monitoring | |||
242 | public virtual OSDMap ToBriefOSDMap() | 242 | public virtual OSDMap ToBriefOSDMap() |
243 | { | 243 | { |
244 | OSDMap ret = new OSDMap(); | 244 | OSDMap ret = new OSDMap(); |
245 | |||
246 | ret.Add("Value", OSD.FromReal(Value)); | 245 | ret.Add("Value", OSD.FromReal(Value)); |
247 | |||
248 | double lastChangeOverTime, averageChangeOverTime; | ||
249 | |||
250 | return ret; | 246 | return ret; |
251 | } | 247 | } |
252 | 248 | ||