OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: be consistent about reporting errors out of HttpServerBase

mb-throttle-test
Justin Clark-Casey (justincc) 2014-10-14 00:35:15 +01:00
parent f4424bdfcf
commit 90f9cea07b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Server/Base/HttpServerBase.cs
View File

@ -84,22 +84,23 @@ namespace OpenSim.Server.Base
// Then, check for https settings and ADD a server to // Then, check for https settings and ADD a server to
// m_Servers // m_Servers
// //
if ( !ssl_main ) if (!ssl_main)
{ {
httpServer = new BaseHttpServer(port); httpServer = new BaseHttpServer(port);
} }
else else
{ {
string cert_path = networkConfig.GetString("cert_path",String.Empty); string cert_path = networkConfig.GetString("cert_path",String.Empty);
if ( cert_path == String.Empty ) if (cert_path == String.Empty)
{ {
System.Console.WriteLine("Path to X509 certificate is missing, server can't start."); System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
Environment.Exit(1); Environment.Exit(1);
} }
string cert_pass = networkConfig.GetString("cert_pass",String.Empty); string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
if ( cert_pass == String.Empty ) if (cert_pass == String.Empty)
{ {
System.Console.WriteLine("Password for X509 certificate is missing, server can't start."); System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
Environment.Exit(1); Environment.Exit(1);
} }
@ -110,20 +111,21 @@ namespace OpenSim.Server.Base
MainServer.Instance = httpServer; MainServer.Instance = httpServer;
// If https_listener = true, then add an ssl listener on the https_port... // If https_listener = true, then add an ssl listener on the https_port...
if ( ssl_listener == true ) { if (ssl_listener == true)
{
uint https_port = (uint)networkConfig.GetInt("https_port", 0); uint https_port = (uint)networkConfig.GetInt("https_port", 0);
string cert_path = networkConfig.GetString("cert_path",String.Empty); string cert_path = networkConfig.GetString("cert_path",String.Empty);
if ( cert_path == String.Empty ) if (cert_path == String.Empty)
{ {
System.Console.WriteLine("Path to X509 certificate is missing, server can't start."); System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
Environment.Exit(1); Environment.Exit(1);
} }
string cert_pass = networkConfig.GetString("cert_pass",String.Empty); string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
if ( cert_pass == String.Empty ) if (cert_pass == String.Empty)
{ {
System.Console.WriteLine("Password for X509 certificate is missing, server can't start."); System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
Environment.Exit(1); Environment.Exit(1);
} }