ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading modules with alternate configurations and ports into ROBUST.

Browse Source 
Make all current modules support the configuration name option
This commit is contained in:
Melanie
2009-09-29 09:44:12 +01:00
parent 6653a30487
commit 1096103d66
14 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ namespace OpenSim.Server.Base
{
// Logger
//
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// The http server instance
//
@@ -55,8 +55,14 @@ namespace OpenSim.Server.Base
get { return m_HttpServer; }
}
public uint DefaultPort
{
get { return m_Port; }
}
public IHttpServer GetHttpServer(uint port)
{
m_Log.InfoFormat("[SERVER]: Requested port {0}", port);
if (port == m_Port)
return HttpServer;
@@ -64,6 +70,8 @@ namespace OpenSim.Server.Base
return m_Servers[port];
m_Servers[port] = new BaseHttpServer(port);
m_Servers[port].Start();
return m_Servers[port];
}

4
OpenSim/Server/Base/ServerUtils.cs
View File

@@ -141,7 +141,9 @@ namespace OpenSim.Server.Base
}
catch (Exception e)
{
m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
if (!(e is System.MissingMethodException))
m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
return null;
}
return plug;