aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs38
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 6fa36b5..d0463c8 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)
@@ -1638,11 +1638,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1638 catch (SocketException e) 1638 catch (SocketException e)
1639 { 1639 {
1640 // This has to be here to prevent a Linux/Mono crash 1640 // This has to be here to prevent a Linux/Mono crash
1641 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); 1641 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1642 } 1642 }
1643 catch (IOException e) 1643 catch (IOException e)
1644 { 1644 {
1645 m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message); 1645 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
1646 } 1646 }
1647 } 1647 }
1648 } 1648 }
@@ -1679,7 +1679,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1679 catch (SocketException e) 1679 catch (SocketException e)
1680 { 1680 {
1681 // This has to be here to prevent a Linux/Mono crash 1681 // This has to be here to prevent a Linux/Mono crash
1682 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); 1682 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1683 } 1683 }
1684 } 1684 }
1685 } 1685 }
@@ -1715,7 +1715,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1715 catch (SocketException e) 1715 catch (SocketException e)
1716 { 1716 {
1717 // This has to be here to prevent a Linux/Mono crash 1717 // This has to be here to prevent a Linux/Mono crash
1718 m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); 1718 m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
1719 } 1719 }
1720 } 1720 }
1721 } 1721 }
@@ -1794,7 +1794,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1794 1794
1795 public void httpServerException(object source, Exception exception) 1795 public void httpServerException(object source, Exception exception)
1796 { 1796 {
1797 m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); 1797 m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
1798 /* 1798 /*
1799 if (HTTPDRunning)// && NotSocketErrors > 5) 1799 if (HTTPDRunning)// && NotSocketErrors > 5)
1800 { 1800 {
generated by cgit v1.1 at 2024-11-05 08:34:54 +0000