1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index dfb09f4..9bb952d 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
            catch (Exception e)
            {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
            }
        }
@@ -551,11 +551,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                    catch (SocketException e)
                    {
                        // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                    }
                    catch (IOException e)
                    {
-                        m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}. ", e.Message), e);
                    }
                    return;
@@ -658,15 +658,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                //
                // An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
                // with the minimum first
-                m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
+                m_log.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux ", e.Message), e);
            }
            catch (IOException e)
            {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
            }
            catch (Exception e)
            {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
                SendHTML500(response);
            }
            finally
@@ -933,11 +933,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                        catch (SocketException e)
                        {
                            // This has to be here to prevent a Linux/Mono crash
-                            m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                        }
                        catch (IOException e)
                        {
-                            m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                        }
                    }
                    return;
@@ -970,11 +970,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                catch (SocketException e)
                {
                    // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                }
                catch (IOException e)
                {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                }
            }
        }
@@ -1085,12 +1085,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                catch (IOException e)
                {
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0} ", e.Message), e);
                }
                catch (SocketException e)
                {
                    // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                }
            }
        }
@@ -1342,8 +1342,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                    catch (SocketException f)
                    {
                        // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat(
+                        m_log.Warn(
-                            "[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);
+                            String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
                    }
                }
                catch(Exception)
@@ -1661,11 +1661,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                catch (SocketException e)
                {
                    // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                }
                catch (IOException e)
                {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                }
            }
        }
@@ -1702,7 +1702,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                catch (SocketException e)
                {
                    // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                }
            }
        }
@@ -1738,7 +1738,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                catch (SocketException e)
                {
                    // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                }
            }
        }
@@ -1817,7 +1817,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void httpServerException(object source, Exception exception)
        {
-            m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
+            m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
           /*
            if (HTTPDRunning)// && NotSocketErrors > 5)
            {

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index dfb09f4..9bb952d 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
356	}	356	}
357	catch (Exception e)	357	catch (Exception e)
358	{	358	{
359	m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);	359	m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
360	}	360	}
361	}	361	}
362		362
@@ -551,11 +551,11 @@ namespace OpenSim.Framework.Servers.HttpServer
551	catch (SocketException e)	551	catch (SocketException e)
552	{	552	{
553	// This has to be here to prevent a Linux/Mono crash	553	// This has to be here to prevent a Linux/Mono crash
554	m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);	554	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
555	}	555	}
556	catch (IOException e)	556	catch (IOException e)
557	{	557	{
558	m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);	558	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}. ", e.Message), e);
559	}	559	}
560		560
561	return;	561	return;
@@ -658,15 +658,15 @@ namespace OpenSim.Framework.Servers.HttpServer
658	//	658	//
659	// An alternative may be to turn off all response write exceptions on the HttpListener, but let's go	659	// An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
660	// with the minimum first	660	// with the minimum first
661	m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);	661	m_log.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux ", e.Message), e);
662	}	662	}
663	catch (IOException e)	663	catch (IOException e)
664	{	664	{
665	m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);	665	m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
666	}	666	}
667	catch (Exception e)	667	catch (Exception e)
668	{	668	{
669	m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);	669	m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
670	SendHTML500(response);	670	SendHTML500(response);
671	}	671	}
672	finally	672	finally
@@ -933,11 +933,11 @@ namespace OpenSim.Framework.Servers.HttpServer
933	catch (SocketException e)	933	catch (SocketException e)
934	{	934	{
935	// This has to be here to prevent a Linux/Mono crash	935	// This has to be here to prevent a Linux/Mono crash
936	m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);	936	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
937	}	937	}
938	catch (IOException e)	938	catch (IOException e)
939	{	939	{
940	m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);	940	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
941	}	941	}
942	}	942	}
943	return;	943	return;
@@ -970,11 +970,11 @@ namespace OpenSim.Framework.Servers.HttpServer
970	catch (SocketException e)	970	catch (SocketException e)
971	{	971	{
972	// This has to be here to prevent a Linux/Mono crash	972	// This has to be here to prevent a Linux/Mono crash
973	m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);	973	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
974	}	974	}
975	catch (IOException e)	975	catch (IOException e)
976	{	976	{
977	m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);	977	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
978	}	978	}
979	}	979	}
980	}	980	}
@@ -1085,12 +1085,12 @@ namespace OpenSim.Framework.Servers.HttpServer
1085	}	1085	}
1086	catch (IOException e)	1086	catch (IOException e)
1087	{	1087	{
1088	m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);	1088	m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0} ", e.Message), e);
1089	}	1089	}
1090	catch (SocketException e)	1090	catch (SocketException e)
1091	{	1091	{
1092	// This has to be here to prevent a Linux/Mono crash	1092	// This has to be here to prevent a Linux/Mono crash
1093	m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);	1093	m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1094	}	1094	}
1095	}	1095	}
1096	}	1096	}
@@ -1342,8 +1342,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1342	catch (SocketException f)	1342	catch (SocketException f)
1343	{	1343	{
1344	// This has to be here to prevent a Linux/Mono crash	1344	// This has to be here to prevent a Linux/Mono crash
1345	m_log.WarnFormat(	1345	m_log.Warn(
1346	"[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);	1346	String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
1347	}	1347	}
1348	}	1348	}
1349	catch(Exception)	1349	catch(Exception)
@@ -1661,11 +1661,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1661	catch (SocketException e)	1661	catch (SocketException e)
1662	{	1662	{
1663	// This has to be here to prevent a Linux/Mono crash	1663	// This has to be here to prevent a Linux/Mono crash
1664	m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);	1664	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1665	}	1665	}
1666	catch (IOException e)	1666	catch (IOException e)
1667	{	1667	{
1668	m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);	1668	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
1669	}	1669	}
1670	}	1670	}
1671	}	1671	}
@@ -1702,7 +1702,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1702	catch (SocketException e)	1702	catch (SocketException e)
1703	{	1703	{
1704	// This has to be here to prevent a Linux/Mono crash	1704	// This has to be here to prevent a Linux/Mono crash
1705	m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);	1705	m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1706	}	1706	}
1707	}	1707	}
1708	}	1708	}
@@ -1738,7 +1738,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1738	catch (SocketException e)	1738	catch (SocketException e)
1739	{	1739	{
1740	// This has to be here to prevent a Linux/Mono crash	1740	// This has to be here to prevent a Linux/Mono crash
1741	m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);	1741	m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1742	}	1742	}
1743	}	1743	}
1744	}	1744	}
@@ -1817,7 +1817,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1817		1817
1818	public void httpServerException(object source, Exception exception)	1818	public void httpServerException(object source, Exception exception)
1819	{	1819	{
1820	m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());	1820	m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
1821	/*	1821	/*
1822	if (HTTPDRunning)// && NotSocketErrors > 5)	1822	if (HTTPDRunning)// && NotSocketErrors > 5)
1823	{	1823	{