diff options
author | Melanie | 2009-09-29 09:56:17 +0100 |
---|---|---|
committer | Melanie | 2009-09-29 09:56:17 +0100 |
commit | 691f1e8aa08db84b689793ea9cd2c72bcfdd9b17 (patch) | |
tree | bccc5f146d169c14615384d60d94f1ae3f79f354 /OpenSim/Server/Base/HttpServerBase.cs | |
parent | Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. (diff) | |
download | opensim-SC-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.zip opensim-SC-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.gz opensim-SC-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.bz2 opensim-SC-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.xz |
Fix loading modules with alternate configurations and ports into ROBUST.
Make all current modules support the configuration name option
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 6a1f37c..ed0210f 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Server.Base | |||
41 | { | 41 | { |
42 | // Logger | 42 | // Logger |
43 | // | 43 | // |
44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | // The http server instance | 46 | // The http server instance |
47 | // | 47 | // |
@@ -55,8 +55,14 @@ namespace OpenSim.Server.Base | |||
55 | get { return m_HttpServer; } | 55 | get { return m_HttpServer; } |
56 | } | 56 | } |
57 | 57 | ||
58 | public uint DefaultPort | ||
59 | { | ||
60 | get { return m_Port; } | ||
61 | } | ||
62 | |||
58 | public IHttpServer GetHttpServer(uint port) | 63 | public IHttpServer GetHttpServer(uint port) |
59 | { | 64 | { |
65 | m_Log.InfoFormat("[SERVER]: Requested port {0}", port); | ||
60 | if (port == m_Port) | 66 | if (port == m_Port) |
61 | return HttpServer; | 67 | return HttpServer; |
62 | 68 | ||
@@ -64,6 +70,8 @@ namespace OpenSim.Server.Base | |||
64 | return m_Servers[port]; | 70 | return m_Servers[port]; |
65 | 71 | ||
66 | m_Servers[port] = new BaseHttpServer(port); | 72 | m_Servers[port] = new BaseHttpServer(port); |
73 | m_Servers[port].Start(); | ||
74 | |||
67 | return m_Servers[port]; | 75 | return m_Servers[port]; |
68 | } | 76 | } |
69 | 77 | ||