From c66b5a9e71caef783781f028c356b7c07fdb1c8b Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 20 Feb 2008 17:54:14 +0000 Subject: [PATCH] Report command string on ConsoleBase.RunCommand exception --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 4 ++-- OpenSim/Framework/Console/ConsoleBase.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 049df0cca9..d94af44778 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -246,7 +246,7 @@ namespace OpenSim.Framework.Communications.Cache } /// - /// Synchronously retreive an asset. If the asset isn't in the cache, a request will be made to the persistent store to + /// Synchronously retreive an asset. If the asset isn't in the cache, a request will be made to the persistent store to /// load it into the cache. /// /// XXX We'll keep polling the cache until we get the asset or we exceed @@ -489,7 +489,7 @@ namespace OpenSim.Framework.Communications.Cache } */ - // Notify callers + // Notify requesters for this asset lock (RequestLists) { AssetRequestsList reqList = RequestLists[assetID]; diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 5361e0f34f..2a996c5f96 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -376,13 +376,14 @@ namespace OpenSim.Framework.Console Array.Resize(ref tempstrarray, tempstrarray.Length - 1); Array.Reverse(tempstrarray); string[] cmdparams = (string[]) tempstrarray; + try { RunCmd(cmd, cmdparams); } catch (Exception e) { - m_log.Error("[Console]: Command failed with exception " + e.ToString()); + m_log.ErrorFormat("[Console]: Command [{0}] failed with exception {1}", command, e.ToString()); } }