diff options
author | Dr Scofield | 2008-07-15 13:06:30 +0000 |
---|---|---|
committer | Dr Scofield | 2008-07-15 13:06:30 +0000 |
commit | 8b933e53c0c679df4b150849a8984ed6068655ad (patch) | |
tree | a07d491e7f0f49a8341ab50c617d0539e88cd2a3 /OpenSim/Framework/Servers/OSHttpServer.cs | |
parent | removes a Console.WriteLine(...) remnant. (diff) | |
download | opensim-SC_OLD-8b933e53c0c679df4b150849a8984ed6068655ad.zip opensim-SC_OLD-8b933e53c0c679df4b150849a8984ed6068655ad.tar.gz opensim-SC_OLD-8b933e53c0c679df4b150849a8984ed6068655ad.tar.bz2 opensim-SC_OLD-8b933e53c0c679df4b150849a8984ed6068655ad.tar.xz |
fixes handler scoring method. XmlRpc code path now fully working with
HttpServer. :-)
Diffstat (limited to 'OpenSim/Framework/Servers/OSHttpServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpServer.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpServer.cs b/OpenSim/Framework/Servers/OSHttpServer.cs index 4940101..e0d26ff 100644 --- a/OpenSim/Framework/Servers/OSHttpServer.cs +++ b/OpenSim/Framework/Servers/OSHttpServer.cs | |||
@@ -106,8 +106,9 @@ namespace OpenSim.Framework.Servers | |||
106 | /// </summary> | 106 | /// </summary> |
107 | public OSHttpServer(IPAddress address, int port, int poolSize) | 107 | public OSHttpServer(IPAddress address, int port, int poolSize) |
108 | { | 108 | { |
109 | _engineId = String.Format("OSHttpServer [HTTP:{0}/ps:{1}]", port, poolSize); | 109 | _engineId = String.Format("OSHttpServer (HTTP:{0})", port); |
110 | _isSecure = false; | 110 | _isSecure = false; |
111 | _log.DebugFormat("[{0}] HTTP server instantiated", EngineID); | ||
111 | 112 | ||
112 | _listener = new HttpListener(address, port); | 113 | _listener = new HttpListener(address, port); |
113 | _queue = new OSHttpRequestQueue(); | 114 | _queue = new OSHttpRequestQueue(); |
@@ -121,6 +122,7 @@ namespace OpenSim.Framework.Servers | |||
121 | { | 122 | { |
122 | _engineId = String.Format("OSHttpServer [HTTPS:{0}/ps:{1}]", port, poolSize); | 123 | _engineId = String.Format("OSHttpServer [HTTPS:{0}/ps:{1}]", port, poolSize); |
123 | _isSecure = true; | 124 | _isSecure = true; |
125 | _log.DebugFormat("[{0}] HTTPS server instantiated", EngineID); | ||
124 | 126 | ||
125 | _listener = new HttpListener(address, port, certificate); | 127 | _listener = new HttpListener(address, port, certificate); |
126 | _queue = new OSHttpRequestQueue(); | 128 | _queue = new OSHttpRequestQueue(); |
@@ -176,8 +178,9 @@ namespace OpenSim.Framework.Servers | |||
176 | 178 | ||
177 | lock (_syncObject) Monitor.Wait(_syncObject); | 179 | lock (_syncObject) Monitor.Wait(_syncObject); |
178 | } | 180 | } |
179 | catch (Exception) | 181 | catch (Exception ex) |
180 | { | 182 | { |
183 | _log.DebugFormat("[{0}] HTTP server startup failed: {1}", EngineID, ex.ToString()); | ||
181 | } | 184 | } |
182 | 185 | ||
183 | _log.InfoFormat("[{0}] HTTP server terminated", EngineID); | 186 | _log.InfoFormat("[{0}] HTTP server terminated", EngineID); |