aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base
diff options
context:
space:
mode:
authorMelanie2009-09-29 09:56:17 +0100
committerMelanie2009-09-29 09:56:17 +0100
commit691f1e8aa08db84b689793ea9cd2c72bcfdd9b17 (patch)
treebccc5f146d169c14615384d60d94f1ae3f79f354 /OpenSim/Server/Base
parentFixed a bug that was causing exceptions to the thrown in ROBUST MainServer. (diff)
downloadopensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.zip
opensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.gz
opensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.bz2
opensim-SC_OLD-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 'OpenSim/Server/Base')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs10
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs4
2 files changed, 12 insertions, 2 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
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 656fcf5..2340645 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -141,7 +141,9 @@ namespace OpenSim.Server.Base
141 } 141 }
142 catch (Exception e) 142 catch (Exception e)
143 { 143 {
144 m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException); 144 if (!(e is System.MissingMethodException))
145 m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
146 return null;
145 } 147 }
146 148
147 return plug; 149 return plug;