diff options
author | Justin Clark-Casey (justincc) | 2009-12-15 16:23:57 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-12-15 16:23:57 +0000 |
commit | 57d60a95a2c3a61bfcff9760b36088f13fa4bbd5 (patch) | |
tree | cbf34fc9caa5a857889d3b662b9cef9479b2ff00 /OpenSim/Framework | |
parent | Change default grid and inventory service ports in ConfigSettings to the ROBU... (diff) | |
download | opensim-SC_OLD-57d60a95a2c3a61bfcff9760b36088f13fa4bbd5.zip opensim-SC_OLD-57d60a95a2c3a61bfcff9760b36088f13fa4bbd5.tar.gz opensim-SC_OLD-57d60a95a2c3a61bfcff9760b36088f13fa4bbd5.tar.bz2 opensim-SC_OLD-57d60a95a2c3a61bfcff9760b36088f13fa4bbd5.tar.xz |
minor: make logging messages consistent in BaseHttpServer
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 75cdeb4..6f41714 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -465,11 +465,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
465 | catch (SocketException e) | 465 | catch (SocketException e) |
466 | { | 466 | { |
467 | // This has to be here to prevent a Linux/Mono crash | 467 | // This has to be here to prevent a Linux/Mono crash |
468 | m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); | 468 | m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); |
469 | } | 469 | } |
470 | catch (IOException e) | 470 | catch (IOException e) |
471 | { | 471 | { |
472 | m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message); | 472 | m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message); |
473 | } | 473 | } |
474 | return; | 474 | return; |
475 | } | 475 | } |
@@ -548,7 +548,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
548 | } | 548 | } |
549 | catch (IOException e) | 549 | catch (IOException e) |
550 | { | 550 | { |
551 | m_log.ErrorFormat("[BASE HTTP SERVER] HandleRequest() threw ", e); | 551 | m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw ", e); |
552 | } | 552 | } |
553 | catch (InvalidOperationException e) | 553 | catch (InvalidOperationException e) |
554 | { | 554 | { |
@@ -763,7 +763,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
763 | byte[] buf = Encoding.UTF8.GetBytes("Not found"); | 763 | byte[] buf = Encoding.UTF8.GetBytes("Not found"); |
764 | response.KeepAlive = false; | 764 | response.KeepAlive = false; |
765 | 765 | ||
766 | m_log.ErrorFormat("[BASE HTTP SERVER] Handler not found for http request {0}", request.RawUrl); | 766 | m_log.ErrorFormat("[BASE HTTP SERVER]: Handler not found for http request {0}", request.RawUrl); |
767 | 767 | ||
768 | response.SendChunked = false; | 768 | response.SendChunked = false; |
769 | response.ContentLength64 = buf.Length; | 769 | response.ContentLength64 = buf.Length; |
@@ -775,7 +775,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
775 | } | 775 | } |
776 | catch (Exception ex) | 776 | catch (Exception ex) |
777 | { | 777 | { |
778 | m_log.Warn("[HTTPD]: Error - " + ex.Message); | 778 | m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message); |
779 | } | 779 | } |
780 | finally | 780 | finally |
781 | { | 781 | { |
@@ -787,11 +787,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
787 | catch (SocketException e) | 787 | catch (SocketException e) |
788 | { | 788 | { |
789 | // This has to be here to prevent a Linux/Mono crash | 789 | // This has to be here to prevent a Linux/Mono crash |
790 | m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); | 790 | m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); |
791 | } | 791 | } |
792 | catch (IOException e) | 792 | catch (IOException e) |
793 | { | 793 | { |
794 | m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message); | 794 | m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message); |
795 | } | 795 | } |
796 | } | 796 | } |
797 | return; | 797 | return; |
@@ -812,7 +812,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
812 | } | 812 | } |
813 | catch (Exception ex) | 813 | catch (Exception ex) |
814 | { | 814 | { |
815 | m_log.Warn("[HTTPD]: Error - " + ex.Message); | 815 | m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message); |
816 | } | 816 | } |
817 | finally | 817 | finally |
818 | { | 818 | { |
@@ -824,11 +824,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
824 | catch (SocketException e) | 824 | catch (SocketException e) |
825 | { | 825 | { |
826 | // This has to be here to prevent a Linux/Mono crash | 826 | // This has to be here to prevent a Linux/Mono crash |
827 | m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); | 827 | m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); |
828 | } | 828 | } |
829 | catch (IOException e) | 829 | catch (IOException e) |
830 | { | 830 | { |
831 | m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message); | 831 | m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message); |
832 | } | 832 | } |
833 | } | 833 | } |
834 | } | 834 | } |
@@ -864,7 +864,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
864 | } | 864 | } |
865 | catch (Exception ex) | 865 | catch (Exception ex) |
866 | { | 866 | { |
867 | m_log.Warn("[HTTPD]: Error - " + ex.Message); | 867 | m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message); |
868 | } | 868 | } |
869 | 869 | ||
870 | if (llsdRequest != null)// && m_defaultLlsdHandler != null) | 870 | if (llsdRequest != null)// && m_defaultLlsdHandler != null) |
@@ -925,7 +925,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
925 | } | 925 | } |
926 | catch (Exception ex) | 926 | catch (Exception ex) |
927 | { | 927 | { |
928 | m_log.Warn("[HTTPD]: Error - " + ex.Message); | 928 | m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message); |
929 | } | 929 | } |
930 | finally | 930 | finally |
931 | { | 931 | { |
@@ -939,12 +939,12 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
939 | } | 939 | } |
940 | catch (IOException e) | 940 | catch (IOException e) |
941 | { | 941 | { |
942 | m_log.DebugFormat("[BASE HTTP SERVER] LLSD IOException {0}.", e); | 942 | m_log.DebugFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e); |
943 | } | 943 | } |
944 | catch (SocketException e) | 944 | catch (SocketException e) |
945 | { | 945 | { |
946 | // This has to be here to prevent a Linux/Mono crash | 946 | // This has to be here to prevent a Linux/Mono crash |
947 | m_log.WarnFormat("[BASE HTTP SERVER] LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e); | 947 | m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e); |
948 | } | 948 | } |
949 | } | 949 | } |
950 | } | 950 | } |
@@ -1482,11 +1482,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1482 | catch (SocketException e) | 1482 | catch (SocketException e) |
1483 | { | 1483 | { |
1484 | // This has to be here to prevent a Linux/Mono crash | 1484 | // This has to be here to prevent a Linux/Mono crash |
1485 | m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); | 1485 | m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); |
1486 | } | 1486 | } |
1487 | catch (IOException e) | 1487 | catch (IOException e) |
1488 | { | 1488 | { |
1489 | m_log.Warn("[BASE HTTP SERVER] XmlRpcRequest issue: " + e.Message); | 1489 | m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message); |
1490 | } | 1490 | } |
1491 | } | 1491 | } |
1492 | } | 1492 | } |
@@ -1510,7 +1510,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1510 | } | 1510 | } |
1511 | catch (Exception ex) | 1511 | catch (Exception ex) |
1512 | { | 1512 | { |
1513 | m_log.Warn("[HTTPD]: Error - " + ex.Message); | 1513 | m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message); |
1514 | } | 1514 | } |
1515 | finally | 1515 | finally |
1516 | { | 1516 | { |
@@ -1523,7 +1523,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1523 | catch (SocketException e) | 1523 | catch (SocketException e) |
1524 | { | 1524 | { |
1525 | // This has to be here to prevent a Linux/Mono crash | 1525 | // This has to be here to prevent a Linux/Mono crash |
1526 | m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); | 1526 | m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e); |
1527 | } | 1527 | } |
1528 | } | 1528 | } |
1529 | } | 1529 | } |
@@ -1546,7 +1546,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1546 | } | 1546 | } |
1547 | catch (Exception ex) | 1547 | catch (Exception ex) |
1548 | { | 1548 | { |
1549 | m_log.Warn("[HTTPD]: Error - " + ex.Message); | 1549 | m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message); |
1550 | } | 1550 | } |
1551 | finally | 1551 | finally |
1552 | { | 1552 | { |
@@ -1566,7 +1566,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1566 | 1566 | ||
1567 | public void Start() | 1567 | public void Start() |
1568 | { | 1568 | { |
1569 | m_log.Info("[HTTPD]: Starting up HTTP Server"); | 1569 | m_log.Info("[BASE HTTP SERVER]: Starting up HTTP Server"); |
1570 | StartHTTP(); | 1570 | StartHTTP(); |
1571 | } | 1571 | } |
1572 | 1572 | ||
@@ -1574,7 +1574,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1574 | { | 1574 | { |
1575 | try | 1575 | try |
1576 | { | 1576 | { |
1577 | m_log.Info("[HTTPD]: Spawned main thread OK"); | 1577 | m_log.Debug("[BASE HTTP SERVER]: Spawned main thread OK"); |
1578 | //m_httpListener = new HttpListener(); | 1578 | //m_httpListener = new HttpListener(); |
1579 | NotSocketErrors = 0; | 1579 | NotSocketErrors = 0; |
1580 | if (!m_ssl) | 1580 | if (!m_ssl) |
@@ -1614,8 +1614,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1614 | } | 1614 | } |
1615 | catch (Exception e) | 1615 | catch (Exception e) |
1616 | { | 1616 | { |
1617 | m_log.Error("[HTTPD]: Error - " + e.Message); | 1617 | m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message); |
1618 | m_log.Error("[HTTPD]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?"); | 1618 | m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?"); |
1619 | 1619 | ||
1620 | // We want this exception to halt the entire server since in current configurations we aren't too | 1620 | // We want this exception to halt the entire server since in current configurations we aren't too |
1621 | // useful without inbound HTTP. | 1621 | // useful without inbound HTTP. |
@@ -1636,7 +1636,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1636 | 1636 | ||
1637 | public void httpServerException(object source, Exception exception) | 1637 | public void httpServerException(object source, Exception exception) |
1638 | { | 1638 | { |
1639 | m_log.ErrorFormat("[HTTPSERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); | 1639 | m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); |
1640 | /* | 1640 | /* |
1641 | if (HTTPDRunning)// && NotSocketErrors > 5) | 1641 | if (HTTPDRunning)// && NotSocketErrors > 5) |
1642 | { | 1642 | { |
@@ -1662,7 +1662,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1662 | } | 1662 | } |
1663 | catch (NullReferenceException) | 1663 | catch (NullReferenceException) |
1664 | { | 1664 | { |
1665 | m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer."); | 1665 | m_log.Warn("[BASE HTTP SERVER]: Null Reference when stopping HttpServer."); |
1666 | } | 1666 | } |
1667 | 1667 | ||
1668 | } | 1668 | } |