diff options
| author | Justin Clark-Casey (justincc) | 2014-10-14 20:42:41 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:21:38 +0000 |
| commit | 6c043dd6ffe673ec3c9b1deb5519d12b19b32f72 (patch) | |
| tree | df1ba40a8f1d0edc13e22ed3a0bbaed18ff2d8dd /OpenSim/Framework | |
| parent | Allow GetMesh capability to be served directly by a server like GetTexture (diff) | |
| download | opensim-SC-6c043dd6ffe673ec3c9b1deb5519d12b19b32f72.zip opensim-SC-6c043dd6ffe673ec3c9b1deb5519d12b19b32f72.tar.gz opensim-SC-6c043dd6ffe673ec3c9b1deb5519d12b19b32f72.tar.bz2 opensim-SC-6c043dd6ffe673ec3c9b1deb5519d12b19b32f72.tar.xz | |
If an exception makes it to the top of a JobEngine request, catch and log instead of letting it terminate the simulator...
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Monitoring/JobEngine.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs index ea2203f..7dcce6a 100644 --- a/OpenSim/Framework/Monitoring/JobEngine.cs +++ b/OpenSim/Framework/Monitoring/JobEngine.cs | |||
| @@ -246,7 +246,16 @@ namespace OpenSim.Framework.Monitoring | |||
| 246 | if (LogLevel >= 1) | 246 | if (LogLevel >= 1) |
| 247 | m_log.DebugFormat("[JOB ENGINE]: Processing job {0}", m_currentJob.Name); | 247 | m_log.DebugFormat("[JOB ENGINE]: Processing job {0}", m_currentJob.Name); |
| 248 | 248 | ||
| 249 | m_currentJob.Callback.Invoke(m_currentJob.O); | 249 | try |
| 250 | { | ||
| 251 | m_currentJob.Callback.Invoke(m_currentJob.O); | ||
| 252 | } | ||
| 253 | catch (Exception e) | ||
| 254 | { | ||
| 255 | m_log.Error( | ||
| 256 | string.Format( | ||
| 257 | "[JOB ENGINE]: Job {0} failed, continuing. Exception ", m_currentJob.Name), e); | ||
| 258 | } | ||
| 250 | 259 | ||
| 251 | if (LogLevel >= 1) | 260 | if (LogLevel >= 1) |
| 252 | m_log.DebugFormat("[JOB ENGINE]: Processed job {0}", m_currentJob.Name); | 261 | m_log.DebugFormat("[JOB ENGINE]: Processed job {0}", m_currentJob.Name); |