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

* Refactored some internals in Grid Server Main

0.6.0-stable
lbsa71 2008-03-12 09:50:12 +00:00
parent d873a043dd
commit f1b8712da3
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/Grid/GridServer/Main.cs
View File

@ -40,17 +40,7 @@ namespace OpenSim.Grid.GridServer
public class OpenGrid_Main : BaseOpenSimServer, conscmd_callback public class OpenGrid_Main : BaseOpenSimServer, conscmd_callback
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private GridConfig m_config;
public GridConfig Cfg;
public static OpenGrid_Main thegrid;
public static bool setuponly;
//public LLUUID highestUUID;
// private SimProfileManager m_simProfileManager;
private GridManager m_gridManager; private GridManager m_gridManager;
[STAThread] [STAThread]
@ -58,16 +48,20 @@ namespace OpenSim.Grid.GridServer
{ {
log4net.Config.XmlConfigurator.Configure(); log4net.Config.XmlConfigurator.Configure();
if (args.Length > 0) OpenGrid_Main app = new OpenGrid_Main();
if (args.Length > 0 && args[0] == "-setuponly")
{ {
if (args[0] == "-setuponly") setuponly = true; app.Config();
} }
else
{
m_log.Info("Starting...\n"); m_log.Info("Starting...\n");
thegrid = new OpenGrid_Main(); app.Startup();
thegrid.Startup();
thegrid.Work(); app.Work();
}
} }
private void Work() private void Work()
@ -98,18 +92,16 @@ namespace OpenSim.Grid.GridServer
public void Startup() public void Startup()
{ {
Cfg = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); Config();
//Yeah srsly, that's it.
if (setuponly) Environment.Exit(0);
m_log.Info("[GRID]: Connecting to Storage Server"); m_log.Info("[GRID]: Connecting to Storage Server");
m_gridManager = new GridManager(); m_gridManager = new GridManager();
m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win m_gridManager.AddPlugin(m_config.DatabaseProvider); // Made of win
m_gridManager.Config = Cfg; m_gridManager.Config = m_config;
m_log.Info("[GRID]: Starting HTTP process"); m_log.Info("[GRID]: Starting HTTP process");
BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort); BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
//GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", m_config.SimSendKey, m_config.SimRecvKey, managercallback);
httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod); httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
@ -140,6 +132,11 @@ namespace OpenSim.Grid.GridServer
simCheckTimer.Enabled = true; simCheckTimer.Enabled = true;
} }
private void Config()
{
m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
}
public void CheckSims(object sender, ElapsedEventArgs e) public void CheckSims(object sender, ElapsedEventArgs e)
{ {
/* /*