diff options
author | Teravus Ovares (Dan Olivares) | 2009-12-03 20:22:38 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-12-03 20:22:38 -0500 |
commit | 675d04dd5d6106ed3b332c2111cd73f01ca5437e (patch) | |
tree | 3f67b493085cd63e06bc752bc1528d0f41835efb /OpenSim/Framework/Servers | |
parent | * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set thi... (diff) | |
parent | if an xml rpc method throws an exception, log as an error to the console as w... (diff) | |
download | opensim-SC_OLD-675d04dd5d6106ed3b332c2111cd73f01ca5437e.zip opensim-SC_OLD-675d04dd5d6106ed3b332c2111cd73f01ca5437e.tar.gz opensim-SC_OLD-675d04dd5d6106ed3b332c2111cd73f01ca5437e.tar.bz2 opensim-SC_OLD-675d04dd5d6106ed3b332c2111cd73f01ca5437e.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index bec5ed3..7de5c4c 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -723,13 +723,21 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
723 | xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint); | 723 | xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint); |
724 | } | 724 | } |
725 | catch(Exception e) | 725 | catch(Exception e) |
726 | { | 726 | { |
727 | string errorMessage | ||
728 | = String.Format( | ||
729 | "Requested method [{0}] from {1} threw exception: {2} {3}", | ||
730 | methodName, request.RemoteIPEndPoint.Address, e.Message, e.StackTrace); | ||
731 | |||
732 | m_log.ErrorFormat("[BASE HTTP SERVER]: {0}", errorMessage); | ||
733 | |||
727 | // if the registered XmlRpc method threw an exception, we pass a fault-code along | 734 | // if the registered XmlRpc method threw an exception, we pass a fault-code along |
728 | xmlRpcResponse = new XmlRpcResponse(); | 735 | xmlRpcResponse = new XmlRpcResponse(); |
736 | |||
729 | // Code probably set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php | 737 | // Code probably set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php |
730 | xmlRpcResponse.SetFault(-32603, String.Format("Requested method [{0}] threw exception: {1}", | 738 | xmlRpcResponse.SetFault(-32603, errorMessage); |
731 | methodName, e.Message)); | ||
732 | } | 739 | } |
740 | |||
733 | // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here | 741 | // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here |
734 | response.KeepAlive = m_rpcHandlersKeepAlive[methodName]; | 742 | response.KeepAlive = m_rpcHandlersKeepAlive[methodName]; |
735 | } | 743 | } |