aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-20 17:54:14 +0000
committerJustin Clarke Casey2008-02-20 17:54:14 +0000
commitc66b5a9e71caef783781f028c356b7c07fdb1c8b (patch)
treed75094ac5c8972b535775ce4ccbf3f53aa9f3d1c /OpenSim
parent* Fixed a long standing race condition in physics events. Could this be the... (diff)
downloadopensim-SC_OLD-c66b5a9e71caef783781f028c356b7c07fdb1c8b.zip
opensim-SC_OLD-c66b5a9e71caef783781f028c356b7c07fdb1c8b.tar.gz
opensim-SC_OLD-c66b5a9e71caef783781f028c356b7c07fdb1c8b.tar.bz2
opensim-SC_OLD-c66b5a9e71caef783781f028c356b7c07fdb1c8b.tar.xz
Report command string on ConsoleBase.RunCommand exception
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs3
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 049df0c..d94af44 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Framework.Communications.Cache
246 } 246 }
247 247
248 /// <summary> 248 /// <summary>
249 /// Synchronously retreive an asset. If the asset isn't in the cache, a request will be made to the persistent store to 249 /// Synchronously retreive an asset. If the asset isn't in the cache, a request will be made to the persistent store to
250 /// load it into the cache. 250 /// load it into the cache.
251 /// 251 ///
252 /// XXX We'll keep polling the cache until we get the asset or we exceed 252 /// XXX We'll keep polling the cache until we get the asset or we exceed
@@ -489,7 +489,7 @@ namespace OpenSim.Framework.Communications.Cache
489 } 489 }
490 */ 490 */
491 491
492 // Notify callers 492 // Notify requesters for this asset
493 lock (RequestLists) 493 lock (RequestLists)
494 { 494 {
495 AssetRequestsList reqList = RequestLists[assetID]; 495 AssetRequestsList reqList = RequestLists[assetID];
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 5361e0f..2a996c5 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -376,13 +376,14 @@ namespace OpenSim.Framework.Console
376 Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1); 376 Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
377 Array.Reverse(tempstrarray); 377 Array.Reverse(tempstrarray);
378 string[] cmdparams = (string[]) tempstrarray; 378 string[] cmdparams = (string[]) tempstrarray;
379
379 try 380 try
380 { 381 {
381 RunCmd(cmd, cmdparams); 382 RunCmd(cmd, cmdparams);
382 } 383 }
383 catch (Exception e) 384 catch (Exception e)
384 { 385 {
385 m_log.Error("[Console]: Command failed with exception " + e.ToString()); 386 m_log.ErrorFormat("[Console]: Command [{0}] failed with exception {1}", command, e.ToString());
386 } 387 }
387 } 388 }
388 389