aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-27 23:46:46 +0100
committerJustin Clark-Casey (justincc)2012-04-27 23:46:46 +0100
commit737e1771635061c1f7104499d282bcc279823f98 (patch)
treea054179a888d3f01599769eb2748c639b05d40d8
parentRevert "Implement bulk inventory update over CAPS (not recursive by design," (diff)
downloadopensim-SC-737e1771635061c1f7104499d282bcc279823f98.zip
opensim-SC-737e1771635061c1f7104499d282bcc279823f98.tar.gz
opensim-SC-737e1771635061c1f7104499d282bcc279823f98.tar.bz2
opensim-SC-737e1771635061c1f7104499d282bcc279823f98.tar.xz
Revert "Log the full exception when errors occur in BaseHttpServer"
This reverts commit e31e7c68c8abfd61fed6dabac5403d8adf42ae87. Applied for patch assessment and accidentally committed too early.
Diffstat
-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 7d31a89..0fbf90a 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.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0}", e.Message), e); 359 m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
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.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 554 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
555 } 555 }
556 catch (IOException e) 556 catch (IOException e)
557 { 557 {
558 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.", e.Message), e); 558 m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
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.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e.Message), e); 661 m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
662 } 662 }
663 catch (IOException e) 663 catch (IOException e)
664 { 664 {
665 m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0}", e.Message), e); 665 m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);
666 } 666 }
667 catch (Exception e) 667 catch (Exception e)
668 { 668 {
669 m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0}", e.Message), e); 669 m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);
670 SendHTML500(response); 670 SendHTML500(response);
671 } 671 }
672 finally 672 finally
@@ -925,11 +925,11 @@ namespace OpenSim.Framework.Servers.HttpServer
925 catch (SocketException e) 925 catch (SocketException e)
926 { 926 {
927 // This has to be here to prevent a Linux/Mono crash 927 // This has to be here to prevent a Linux/Mono crash
928 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 928 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
929 } 929 }
930 catch (IOException e) 930 catch (IOException e)
931 { 931 {
932 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}", e.Message), e); 932 m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
933 } 933 }
934 } 934 }
935 return; 935 return;
@@ -962,11 +962,11 @@ namespace OpenSim.Framework.Servers.HttpServer
962 catch (SocketException e) 962 catch (SocketException e)
963 { 963 {
964 // This has to be here to prevent a Linux/Mono crash 964 // This has to be here to prevent a Linux/Mono crash
965 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 965 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
966 } 966 }
967 catch (IOException e) 967 catch (IOException e)
968 { 968 {
969 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}", e.Message), e); 969 m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
970 } 970 }
971 } 971 }
972 } 972 }
@@ -1077,12 +1077,12 @@ namespace OpenSim.Framework.Servers.HttpServer
1077 } 1077 }
1078 catch (IOException e) 1078 catch (IOException e)
1079 { 1079 {
1080 m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0}", e.Message), e); 1080 m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
1081 } 1081 }
1082 catch (SocketException e) 1082 catch (SocketException e)
1083 { 1083 {
1084 // This has to be here to prevent a Linux/Mono crash 1084 // This has to be here to prevent a Linux/Mono crash
1085 m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 1085 m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);
1086 } 1086 }
1087 } 1087 }
1088 } 1088 }
@@ -1334,8 +1334,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1334 catch (SocketException f) 1334 catch (SocketException f)
1335 { 1335 {
1336 // This has to be here to prevent a Linux/Mono crash 1336 // This has to be here to prevent a Linux/Mono crash
1337 m_log.Warn( 1337 m_log.WarnFormat(
1338 String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f.Message), f); 1338 "[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);
1339 } 1339 }
1340 } 1340 }
1341 catch(Exception) 1341 catch(Exception)
@@ -1630,11 +1630,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1630 catch (SocketException e) 1630 catch (SocketException e)
1631 { 1631 {
1632 // This has to be here to prevent a Linux/Mono crash 1632 // This has to be here to prevent a Linux/Mono crash
1633 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 1633 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
1634 } 1634 }
1635 catch (IOException e) 1635 catch (IOException e)
1636 { 1636 {
1637 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}", e.Message), e); 1637 m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
1638 } 1638 }
1639 } 1639 }
1640 } 1640 }
@@ -1671,7 +1671,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1671 catch (SocketException e) 1671 catch (SocketException e)
1672 { 1672 {
1673 // This has to be here to prevent a Linux/Mono crash 1673 // This has to be here to prevent a Linux/Mono crash
1674 m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 1674 m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
1675 } 1675 }
1676 } 1676 }
1677 } 1677 }
@@ -1707,7 +1707,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1707 catch (SocketException e) 1707 catch (SocketException e)
1708 { 1708 {
1709 // This has to be here to prevent a Linux/Mono crash 1709 // This has to be here to prevent a Linux/Mono crash
1710 m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e.Message), e); 1710 m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
1711 } 1711 }
1712 } 1712 }
1713 } 1713 }
@@ -1786,7 +1786,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1786 1786
1787 public void httpServerException(object source, Exception exception) 1787 public void httpServerException(object source, Exception exception)
1788 { 1788 {
1789 m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1}", source.ToString(), exception.Message), exception); 1789 m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
1790 /* 1790 /*
1791 if (HTTPDRunning)// && NotSocketErrors > 5) 1791 if (HTTPDRunning)// && NotSocketErrors > 5)
1792 { 1792 {
generated by cgit v1.1 at 2024-11-18 12:16:53 +0000