aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorjustincc2009-12-19 16:58:30 +0000
committerjustincc2009-12-19 16:58:30 +0000
commit754bfeeb0465201f3a2968214ba0bd66bf44e1bc (patch)
tree9a912c0aa9f6ff6b51680a74d2a058535ddbf98d
parentAdd more log messages for message service/user service get_friends_list inter... (diff)
downloadopensim-SC-754bfeeb0465201f3a2968214ba0bd66bf44e1bc.zip
opensim-SC-754bfeeb0465201f3a2968214ba0bd66bf44e1bc.tar.gz
opensim-SC-754bfeeb0465201f3a2968214ba0bd66bf44e1bc.tar.bz2
opensim-SC-754bfeeb0465201f3a2968214ba0bd66bf44e1bc.tar.xz
Add log warning if xmlrpc request deserialization fails
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs21
1 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 8eeb067..c469010 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -40,7 +40,7 @@ using HttpServer;
40using log4net; 40using log4net;
41using Nwc.XmlRpc; 41using Nwc.XmlRpc;
42using OpenMetaverse.StructuredData; 42using OpenMetaverse.StructuredData;
43using CoolHTTPListener = HttpServer.HttpListener; 43using CoolHTTPListener = HttpServer.HttpListener;
44using CoolHttpServer = HttpServer; 44using CoolHttpServer = HttpServer;
45using HttpListener=System.Net.HttpListener; 45using HttpListener=System.Net.HttpListener;
46 46
@@ -700,10 +700,13 @@ namespace OpenSim.Framework.Servers.HttpServer
700 700
701 try 701 try
702 { 702 {
703 xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody); 703 xmlRprcRequest = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
704 } 704 }
705 catch (XmlException) 705 catch (XmlException e)
706 { 706 {
707 m_log.WarnFormat(
708 "[BASE HTTP SERVER]: Ignoring XMLRPC request from {0} due to deserialization exception {1} {2}",
709 request.RemoteIPEndPoint, e.Message, e.StackTrace);
707 } 710 }
708 711
709 if (xmlRprcRequest != null) 712 if (xmlRprcRequest != null)
@@ -1825,19 +1828,19 @@ namespace OpenSim.Framework.Servers.HttpServer
1825 public void Write(object source, LogPrio priority, string message) 1828 public void Write(object source, LogPrio priority, string message)
1826 { 1829 {
1827 switch (priority) 1830 switch (priority)
1828 { 1831 {
1829 case CoolHttpServer.LogPrio.Debug: 1832 case CoolHttpServer.LogPrio.Debug:
1830 m_log.DebugFormat("[{0}]: {1}", source.ToString(), message); 1833 m_log.DebugFormat("[{0}]: {1}", source.ToString(), message);
1831 break; 1834 break;
1832 case CoolHttpServer.LogPrio.Error: 1835 case CoolHttpServer.LogPrio.Error:
1833 m_log.ErrorFormat("[{0}]: {1}", source.ToString(), message); 1836 m_log.ErrorFormat("[{0}]: {1}", source.ToString(), message);
1834 break; 1837 break;
1835 case CoolHttpServer.LogPrio.Info: 1838 case CoolHttpServer.LogPrio.Info:
1836 m_log.InfoFormat("[{0}]: {1}", source.ToString(), message); 1839 m_log.InfoFormat("[{0}]: {1}", source.ToString(), message);
1837 break; 1840 break;
1838 case CoolHttpServer.LogPrio.Warning: 1841 case CoolHttpServer.LogPrio.Warning:
1839 m_log.WarnFormat("[{0}]: {1}", source.ToString(), message); 1842 m_log.WarnFormat("[{0}]: {1}", source.ToString(), message);
1840 break; 1843 break;
1841 case CoolHttpServer.LogPrio.Fatal: 1844 case CoolHttpServer.LogPrio.Fatal:
1842 m_log.ErrorFormat("[{0}]: FATAL! - {1}", source.ToString(), message); 1845 m_log.ErrorFormat("[{0}]: FATAL! - {1}", source.ToString(), message);
1843 break; 1846 break;