aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/HttpServerBase.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-15 02:03:50 +0100
committerJustin Clark-Casey (justincc)2012-06-15 02:03:50 +0100
commit257b1b517dec58bf902bac63bc7ab7080286d415 (patch)
treee0528b6032f1403cbcd03a216b527c565a2ac777 /OpenSim/Server/Base/HttpServerBase.cs
parentminor: Tell user the current debug http level if "debug http" console command... (diff)
downloadopensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.zip
opensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.tar.gz
opensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.tar.bz2
opensim-SC_OLD-257b1b517dec58bf902bac63bc7ab7080286d415.tar.xz
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
This does require the server to be added before it is set as the main Instance
Diffstat (limited to 'OpenSim/Server/Base/HttpServerBase.cs')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index d471559..7014303 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -138,6 +138,7 @@ namespace OpenSim.Server.Base
138 m_HttpServer = new BaseHttpServer(port, ssl_main, cert_path, cert_pass); 138 m_HttpServer = new BaseHttpServer(port, ssl_main, cert_path, cert_pass);
139 } 139 }
140 140
141 MainServer.AddHttpServer(m_HttpServer);
141 MainServer.Instance = m_HttpServer; 142 MainServer.Instance = m_HttpServer;
142 143
143 // If https_listener = true, then add an ssl listener on the https_port... 144 // If https_listener = true, then add an ssl listener on the https_port...
@@ -157,16 +158,8 @@ namespace OpenSim.Server.Base
157 System.Console.WriteLine("Password for X509 certificate is missing, server can't start."); 158 System.Console.WriteLine("Password for X509 certificate is missing, server can't start.");
158 Thread.CurrentThread.Abort(); 159 Thread.CurrentThread.Abort();
159 } 160 }
160 // Add our https_server 161
161 BaseHttpServer server = null; 162 m_Servers.Add(https_port, new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass));
162 server = new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass);
163 if (server != null)
164 {
165 m_Log.InfoFormat("[SERVER]: Starting HTTPS server on port {0}", https_port);
166 m_Servers.Add(https_port,server);
167 }
168 else
169 System.Console.WriteLine(String.Format("Failed to start HTTPS server on port {0}",https_port));
170 } 163 }
171 } 164 }
172 165