aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-25 21:36:57 +0000
committerJustin Clark-Casey (justincc)2010-05-20 23:17:56 +0100
commitfa8def5e709a5136722ca1ffa0e7b46aacaab8c5 (patch)
tree740e2971a9c8383a21f386269e6327753941a08c /OpenSim/Framework
parentput out full exception stack if something reaches top of base http server OnR... (diff)
downloadopensim-SC-fa8def5e709a5136722ca1ffa0e7b46aacaab8c5.zip
opensim-SC-fa8def5e709a5136722ca1ffa0e7b46aacaab8c5.tar.gz
opensim-SC-fa8def5e709a5136722ca1ffa0e7b46aacaab8c5.tar.bz2
opensim-SC-fa8def5e709a5136722ca1ffa0e7b46aacaab8c5.tar.xz
minor: Print out port that http servers are using
do this in callers so that we know who is setting up these things
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/MainServer.cs8
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 84cc05e..1f5f208 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -25,13 +25,17 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Framework.Servers.HttpServer;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net;
31using OpenSim.Framework.Servers.HttpServer;
30 32
31namespace OpenSim.Framework 33namespace OpenSim.Framework
32{ 34{
33 public class MainServer 35 public class MainServer
34 { 36 {
37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38
35 private static BaseHttpServer instance = null; 39 private static BaseHttpServer instance = null;
36 private static Dictionary<uint, BaseHttpServer> m_Servers = 40 private static Dictionary<uint, BaseHttpServer> m_Servers =
37 new Dictionary<uint, BaseHttpServer>(); 41 new Dictionary<uint, BaseHttpServer>();
@@ -53,6 +57,8 @@ namespace OpenSim.Framework
53 return m_Servers[port]; 57 return m_Servers[port];
54 58
55 m_Servers[port] = new BaseHttpServer(port); 59 m_Servers[port] = new BaseHttpServer(port);
60
61 m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
56 m_Servers[port].Start(); 62 m_Servers[port].Start();
57 63
58 return m_Servers[port]; 64 return m_Servers[port];
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 7c9e51e..297d047 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1572,7 +1572,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1572 1572
1573 public void Start() 1573 public void Start()
1574 { 1574 {
1575 m_log.Info("[BASE HTTP SERVER]: Starting up HTTP Server");
1576 StartHTTP(); 1575 StartHTTP();
1577 } 1576 }
1578 1577
@@ -1580,7 +1579,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1580 { 1579 {
1581 try 1580 try
1582 { 1581 {
1583 m_log.Debug("[BASE HTTP SERVER]: Spawned main thread OK");
1584 //m_httpListener = new HttpListener(); 1582 //m_httpListener = new HttpListener();
1585 NotSocketErrors = 0; 1583 NotSocketErrors = 0;
1586 if (!m_ssl) 1584 if (!m_ssl)