* Rex merges, Grid Server
Adam Frisby
parent
f55bba8019
commit
79cb89f406
|
|
@ -1,170 +1,172 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
using System;
|
using System;
|
||||||
using Db4objects.Db4o;
|
using Db4objects.Db4o;
|
||||||
using OpenSim.Framework.Configuration;
|
using OpenSim.Framework.Configuration;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Interfaces;
|
using OpenSim.Framework.Interfaces;
|
||||||
|
|
||||||
namespace OpenGrid.Config.GridConfigDb4o
|
namespace OpenGrid.Config.GridConfigDb4o
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A grid configuration interface for returning the DB4o Config Provider
|
/// A grid configuration interface for returning the DB4o Config Provider
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Db40ConfigPlugin: IGridConfig
|
public class Db40ConfigPlugin: IGridConfig
|
||||||
{
|
{
|
||||||
/// <summary>
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
/// Loads and returns a configuration objeect
|
|
||||||
/// </summary>
|
/// <summary>
|
||||||
/// <returns>A grid configuration object</returns>
|
/// Loads and returns a configuration objeect
|
||||||
public GridConfig GetConfigObject()
|
/// </summary>
|
||||||
{
|
/// <returns>A grid configuration object</returns>
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Loading Db40Config dll");
|
public GridConfig GetConfigObject()
|
||||||
return new DbGridConfig();
|
{
|
||||||
}
|
m_log.Info("[DBGRIDCONFIG]: Loading Db40Config dll");
|
||||||
}
|
return new DbGridConfig();
|
||||||
|
}
|
||||||
/// <summary>
|
}
|
||||||
/// A DB4o based Gridserver configuration object
|
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public class DbGridConfig : GridConfig
|
/// A DB4o based Gridserver configuration object
|
||||||
{
|
/// </summary>
|
||||||
/// <summary>
|
public class DbGridConfig : GridConfig
|
||||||
/// The DB4o Database
|
{
|
||||||
/// </summary>
|
/// <summary>
|
||||||
private IObjectContainer db;
|
/// The DB4o Database
|
||||||
|
/// </summary>
|
||||||
/// <summary>
|
private IObjectContainer db;
|
||||||
/// User configuration for the Grid Config interfaces
|
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public void LoadDefaults()
|
/// User configuration for the Grid Config interfaces
|
||||||
{
|
/// </summary>
|
||||||
MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
public void LoadDefaults()
|
||||||
|
{
|
||||||
// About the grid options
|
MainConsole.Instance.Info("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||||
this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
|
|
||||||
|
// About the grid options
|
||||||
// Asset Options
|
this.GridOwner = MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
|
||||||
this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
|
|
||||||
this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
|
// Asset Options
|
||||||
this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
|
this.DefaultAssetServer = MainConsole.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
|
||||||
|
this.AssetSendKey = MainConsole.Instance.CmdPrompt("Key to send to asset server","null");
|
||||||
// User Server Options
|
this.AssetRecvKey = MainConsole.Instance.CmdPrompt("Key to expect from asset server","null");
|
||||||
this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
|
|
||||||
this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
|
// User Server Options
|
||||||
this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
|
this.DefaultUserServer = MainConsole.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
|
||||||
|
this.UserSendKey = MainConsole.Instance.CmdPrompt("Key to send to user server","null");
|
||||||
// Region Server Options
|
this.UserRecvKey = MainConsole.Instance.CmdPrompt("Key to expect from user server","null");
|
||||||
this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null");
|
|
||||||
this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null");
|
// Region Server Options
|
||||||
}
|
this.SimSendKey = MainConsole.Instance.CmdPrompt("Key to send to sims","null");
|
||||||
|
this.SimRecvKey = MainConsole.Instance.CmdPrompt("Key to expect from sims","null");
|
||||||
/// <summary>
|
}
|
||||||
/// Initialises a new configuration object
|
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public override void InitConfig()
|
/// Initialises a new configuration object
|
||||||
{
|
/// </summary>
|
||||||
try
|
public override void InitConfig()
|
||||||
{
|
{
|
||||||
// Perform Db4o initialisation
|
try
|
||||||
db = Db4oFactory.OpenFile("opengrid.yap");
|
{
|
||||||
|
// Perform Db4o initialisation
|
||||||
// Locate the grid configuration object
|
db = Db4oFactory.OpenFile("opengrid.yap");
|
||||||
IObjectSet result = db.Get(typeof(DbGridConfig));
|
|
||||||
// Found?
|
// Locate the grid configuration object
|
||||||
if (result.Count==1)
|
IObjectSet result = db.Get(typeof(DbGridConfig));
|
||||||
{
|
// Found?
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Found a GridConfig object in the local database, loading");
|
if (result.Count==1)
|
||||||
foreach (DbGridConfig cfg in result)
|
{
|
||||||
{
|
m_log.Info("[DBGRIDCONFIG]: Found a GridConfig object in the local database, loading");
|
||||||
// Import each setting into this class
|
foreach (DbGridConfig cfg in result)
|
||||||
// Grid Settings
|
{
|
||||||
this.GridOwner=cfg.GridOwner;
|
// Import each setting into this class
|
||||||
// Asset Settings
|
// Grid Settings
|
||||||
this.DefaultAssetServer=cfg.DefaultAssetServer;
|
this.GridOwner=cfg.GridOwner;
|
||||||
this.AssetSendKey=cfg.AssetSendKey;
|
// Asset Settings
|
||||||
this.AssetRecvKey=cfg.AssetRecvKey;
|
this.DefaultAssetServer=cfg.DefaultAssetServer;
|
||||||
// User Settings
|
this.AssetSendKey=cfg.AssetSendKey;
|
||||||
this.DefaultUserServer=cfg.DefaultUserServer;
|
this.AssetRecvKey=cfg.AssetRecvKey;
|
||||||
this.UserSendKey=cfg.UserSendKey;
|
// User Settings
|
||||||
this.UserRecvKey=cfg.UserRecvKey;
|
this.DefaultUserServer=cfg.DefaultUserServer;
|
||||||
// Region Settings
|
this.UserSendKey=cfg.UserSendKey;
|
||||||
this.SimSendKey=cfg.SimSendKey;
|
this.UserRecvKey=cfg.UserRecvKey;
|
||||||
this.SimRecvKey=cfg.SimRecvKey;
|
// Region Settings
|
||||||
}
|
this.SimSendKey=cfg.SimSendKey;
|
||||||
// Create a new configuration object from this class
|
this.SimRecvKey=cfg.SimRecvKey;
|
||||||
}
|
}
|
||||||
else
|
// Create a new configuration object from this class
|
||||||
{
|
}
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Could not find object in database, loading precompiled defaults");
|
else
|
||||||
|
{
|
||||||
// Load default settings into this class
|
m_log.Info("[DBGRIDCONFIG]: Could not find object in database, loading precompiled defaults");
|
||||||
LoadDefaults();
|
|
||||||
|
// Load default settings into this class
|
||||||
// Saves to the database file...
|
LoadDefaults();
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Writing out default settings to local database");
|
|
||||||
db.Set(this);
|
// Saves to the database file...
|
||||||
|
m_log.Info("[DBGRIDCONFIG]: Writing out default settings to local database");
|
||||||
// Closes file locks
|
db.Set(this);
|
||||||
db.Close();
|
|
||||||
}
|
// Closes file locks
|
||||||
}
|
db.Close();
|
||||||
catch(Exception e)
|
}
|
||||||
{
|
}
|
||||||
MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
|
catch(Exception e)
|
||||||
MainLog.Instance.Warn(e.ToString());
|
{
|
||||||
}
|
m_log.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
|
||||||
|
m_log.Warn(e.ToString());
|
||||||
// Grid Settings
|
}
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Grid settings loaded:");
|
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Grid owner: " + this.GridOwner);
|
// Grid Settings
|
||||||
|
m_log.Info("[DBGRIDCONFIG]: Grid settings loaded:");
|
||||||
// Asset Settings
|
m_log.Info("[DBGRIDCONFIG]: Grid owner: " + this.GridOwner);
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Default asset server: " + this.DefaultAssetServer);
|
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to asset server: " + this.AssetSendKey);
|
// Asset Settings
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from asset server: " + this.AssetRecvKey);
|
m_log.Info("[DBGRIDCONFIG]: Default asset server: " + this.DefaultAssetServer);
|
||||||
|
m_log.Info("[DBGRIDCONFIG]: Key to send to asset server: " + this.AssetSendKey);
|
||||||
// User Settings
|
m_log.Info("[DBGRIDCONFIG]: Key to expect from asset server: " + this.AssetRecvKey);
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Default user server: " + this.DefaultUserServer);
|
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to user server: " + this.UserSendKey);
|
// User Settings
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from user server: " + this.UserRecvKey);
|
m_log.Info("[DBGRIDCONFIG]: Default user server: " + this.DefaultUserServer);
|
||||||
|
m_log.Info("[DBGRIDCONFIG]: Key to send to user server: " + this.UserSendKey);
|
||||||
// Region Settings
|
m_log.Info("[DBGRIDCONFIG]: Key to expect from user server: " + this.UserRecvKey);
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to sims: " + this.SimSendKey);
|
|
||||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from sims: " + this.SimRecvKey);
|
// Region Settings
|
||||||
}
|
m_log.Info("[DBGRIDCONFIG]: Key to send to sims: " + this.SimSendKey);
|
||||||
|
m_log.Info("[DBGRIDCONFIG]: Key to expect from sims: " + this.SimRecvKey);
|
||||||
/// <summary>
|
}
|
||||||
/// Closes down the database and releases filesystem locks
|
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public void Shutdown()
|
/// Closes down the database and releases filesystem locks
|
||||||
{
|
/// </summary>
|
||||||
db.Close();
|
public void Shutdown()
|
||||||
}
|
{
|
||||||
}
|
db.Close();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,226 +1,220 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
|
|
||||||
namespace OpenSim.Grid.GridServer
|
namespace OpenSim.Grid.GridServer
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class OpenGrid_Main : conscmd_callback
|
public class OpenGrid_Main : BaseOpenSimServer, conscmd_callback
|
||||||
{
|
{
|
||||||
public GridConfig Cfg;
|
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
public static OpenGrid_Main thegrid;
|
public GridConfig Cfg;
|
||||||
|
|
||||||
public static bool setuponly;
|
public static OpenGrid_Main thegrid;
|
||||||
|
|
||||||
//public LLUUID highestUUID;
|
public static bool setuponly;
|
||||||
|
|
||||||
// private SimProfileManager m_simProfileManager;
|
//public LLUUID highestUUID;
|
||||||
|
|
||||||
private GridManager m_gridManager;
|
// private SimProfileManager m_simProfileManager;
|
||||||
|
|
||||||
private LogBase m_console;
|
private GridManager m_gridManager;
|
||||||
|
|
||||||
[STAThread]
|
[STAThread]
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
if (args.Length > 0)
|
log4net.Config.XmlConfigurator.Configure();
|
||||||
{
|
|
||||||
if (args[0] == "-setuponly") setuponly = true;
|
if (args.Length > 0)
|
||||||
}
|
{
|
||||||
Console.WriteLine("Starting...\n");
|
if (args[0] == "-setuponly") setuponly = true;
|
||||||
|
}
|
||||||
thegrid = new OpenGrid_Main();
|
m_log.Info("Starting...\n");
|
||||||
thegrid.Startup();
|
|
||||||
|
thegrid = new OpenGrid_Main();
|
||||||
thegrid.Work();
|
thegrid.Startup();
|
||||||
}
|
|
||||||
|
thegrid.Work();
|
||||||
private void Work()
|
}
|
||||||
{
|
|
||||||
m_console.Notice("Enter help for a list of commands\n");
|
private void Work()
|
||||||
|
{
|
||||||
while (true)
|
m_console.Notice("Enter help for a list of commands\n");
|
||||||
{
|
|
||||||
m_console.MainLogPrompt();
|
while (true)
|
||||||
}
|
{
|
||||||
}
|
m_console.Prompt();
|
||||||
|
}
|
||||||
private OpenGrid_Main()
|
}
|
||||||
{
|
|
||||||
if (!Directory.Exists(Util.logDir()))
|
private OpenGrid_Main()
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(Util.logDir());
|
m_console = new ConsoleBase("OpenGrid", this);
|
||||||
}
|
MainConsole.Instance = m_console;
|
||||||
m_console =
|
}
|
||||||
new LogBase((Path.Combine(Util.logDir(), "opengrid-gridserver-console.log")), "OpenGrid", this, true);
|
|
||||||
MainLog.Instance = m_console;
|
public void managercallback(string cmd)
|
||||||
}
|
{
|
||||||
|
switch (cmd)
|
||||||
public void managercallback(string cmd)
|
{
|
||||||
{
|
case "shutdown":
|
||||||
switch (cmd)
|
RunCmd("shutdown", new string[0]);
|
||||||
{
|
break;
|
||||||
case "shutdown":
|
}
|
||||||
RunCmd("shutdown", new string[0]);
|
}
|
||||||
break;
|
|
||||||
}
|
public void Startup()
|
||||||
}
|
{
|
||||||
|
Cfg = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
|
||||||
|
//Yeah srsly, that's it.
|
||||||
public void Startup()
|
if (setuponly) Environment.Exit(0);
|
||||||
{
|
|
||||||
Cfg = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
|
m_log.Info("[GRID]: Connecting to Storage Server");
|
||||||
//Yeah srsly, that's it.
|
m_gridManager = new GridManager();
|
||||||
if (setuponly) Environment.Exit(0);
|
m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win
|
||||||
|
m_gridManager.config = Cfg;
|
||||||
m_console.Verbose("GRID", "Connecting to Storage Server");
|
|
||||||
m_gridManager = new GridManager();
|
m_log.Info("[GRID]: Starting HTTP process");
|
||||||
m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win
|
BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
|
||||||
m_gridManager.config = Cfg;
|
//GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
|
||||||
|
|
||||||
m_console.Verbose("GRID", "Starting HTTP process");
|
httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
|
||||||
BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
|
httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
|
||||||
//GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
|
httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
|
||||||
|
|
||||||
httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
|
// Message Server ---> Grid Server
|
||||||
httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
|
httpServer.AddXmlRPCHandler("register_messageserver", m_gridManager.XmlRPCRegisterMessageServer);
|
||||||
httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
|
httpServer.AddXmlRPCHandler("deregister_messageserver", m_gridManager.XmlRPCDeRegisterMessageServer);
|
||||||
|
|
||||||
// Message Server ---> Grid Server
|
|
||||||
httpServer.AddXmlRPCHandler("register_messageserver", m_gridManager.XmlRPCRegisterMessageServer);
|
httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod));
|
||||||
httpServer.AddXmlRPCHandler("deregister_messageserver", m_gridManager.XmlRPCDeRegisterMessageServer);
|
httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", m_gridManager.RestSetSimMethod));
|
||||||
|
|
||||||
|
httpServer.AddStreamHandler(new RestStreamHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod));
|
||||||
httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod));
|
httpServer.AddStreamHandler(new RestStreamHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod));
|
||||||
httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", m_gridManager.RestSetSimMethod));
|
|
||||||
|
//httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod);
|
||||||
httpServer.AddStreamHandler(new RestStreamHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod));
|
//httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod);
|
||||||
httpServer.AddStreamHandler(new RestStreamHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod));
|
//httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);
|
||||||
|
//httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);
|
||||||
//httpServer.AddRestHandler("GET", "/sims/", m_gridManager.RestGetSimMethod);
|
|
||||||
//httpServer.AddRestHandler("POST", "/sims/", m_gridManager.RestSetSimMethod);
|
httpServer.Start();
|
||||||
//httpServer.AddRestHandler("GET", "/regions/", m_gridManager.RestGetRegionMethod);
|
|
||||||
//httpServer.AddRestHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod);
|
m_log.Info("[GRID]: Starting sim status checker");
|
||||||
|
|
||||||
httpServer.Start();
|
Timer simCheckTimer = new Timer(3600000*3); // 3 Hours between updates.
|
||||||
|
simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
|
||||||
m_console.Verbose("GRID", "Starting sim status checker");
|
simCheckTimer.Enabled = true;
|
||||||
|
}
|
||||||
Timer simCheckTimer = new Timer(3600000*3); // 3 Hours between updates.
|
|
||||||
simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
|
public void CheckSims(object sender, ElapsedEventArgs e)
|
||||||
simCheckTimer.Enabled = true;
|
{
|
||||||
}
|
/*
|
||||||
|
foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
|
||||||
public void CheckSims(object sender, ElapsedEventArgs e)
|
{
|
||||||
{
|
string SimResponse = String.Empty;
|
||||||
/*
|
try
|
||||||
foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
|
{
|
||||||
{
|
WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
|
||||||
string SimResponse = "";
|
CheckSim.Method = "GET";
|
||||||
try
|
CheckSim.ContentType = "text/plaintext";
|
||||||
{
|
CheckSim.ContentLength = 0;
|
||||||
WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
|
|
||||||
CheckSim.Method = "GET";
|
StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
|
||||||
CheckSim.ContentType = "text/plaintext";
|
stOut.Write(String.Empty);
|
||||||
CheckSim.ContentLength = 0;
|
stOut.Close();
|
||||||
|
|
||||||
StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
|
StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
|
||||||
stOut.Write("");
|
SimResponse = stIn.ReadToEnd();
|
||||||
stOut.Close();
|
stIn.Close();
|
||||||
|
}
|
||||||
StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
|
catch
|
||||||
SimResponse = stIn.ReadToEnd();
|
{
|
||||||
stIn.Close();
|
}
|
||||||
}
|
|
||||||
catch
|
if (SimResponse == "OK")
|
||||||
{
|
{
|
||||||
}
|
m_simProfileManager.SimProfiles[sim.UUID].online = true;
|
||||||
|
}
|
||||||
if (SimResponse == "OK")
|
else
|
||||||
{
|
{
|
||||||
m_simProfileManager.SimProfiles[sim.UUID].online = true;
|
m_simProfileManager.SimProfiles[sim.UUID].online = false;
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
{
|
*/
|
||||||
m_simProfileManager.SimProfiles[sim.UUID].online = false;
|
}
|
||||||
}
|
|
||||||
}
|
public override void RunCmd(string cmd, string[] cmdparams)
|
||||||
*/
|
{
|
||||||
}
|
base.RunCmd(cmd, cmdparams);
|
||||||
|
|
||||||
public void RunCmd(string cmd, string[] cmdparams)
|
switch (cmd)
|
||||||
{
|
{
|
||||||
switch (cmd)
|
case "help":
|
||||||
{
|
m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
|
||||||
case "help":
|
break;
|
||||||
m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
|
|
||||||
break;
|
case "shutdown":
|
||||||
|
m_console.Close();
|
||||||
case "shutdown":
|
Environment.Exit(0);
|
||||||
m_console.Close();
|
break;
|
||||||
Environment.Exit(0);
|
}
|
||||||
break;
|
}
|
||||||
}
|
|
||||||
}
|
/*private void ConfigDB(IGenericConfig configData)
|
||||||
|
{
|
||||||
public void Show(string ShowWhat)
|
try
|
||||||
{
|
{
|
||||||
}
|
string attri = String.Empty;
|
||||||
|
attri = configData.GetAttribute("DataBaseProvider");
|
||||||
/*private void ConfigDB(IGenericConfig configData)
|
if (attri == String.Empty)
|
||||||
{
|
{
|
||||||
try
|
GridDll = "OpenSim.Framework.Data.DB4o.dll";
|
||||||
{
|
configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
|
||||||
string attri = "";
|
}
|
||||||
attri = configData.GetAttribute("DataBaseProvider");
|
else
|
||||||
if (attri == "")
|
{
|
||||||
{
|
GridDll = attri;
|
||||||
GridDll = "OpenSim.Framework.Data.DB4o.dll";
|
}
|
||||||
configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
|
configData.Commit();
|
||||||
}
|
}
|
||||||
else
|
catch
|
||||||
{
|
{
|
||||||
GridDll = attri;
|
|
||||||
}
|
}
|
||||||
configData.Commit();
|
}*/
|
||||||
}
|
}
|
||||||
catch
|
}
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,63 +1,63 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
// General Information about an assembly is controlled through the following
|
||||||
// set of attributes. Change these attribute values to modify the information
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// associated with an assembly.
|
// associated with an assembly.
|
||||||
|
|
||||||
[assembly : AssemblyTitle("OGS-GridServer")]
|
[assembly : AssemblyTitle("OGS-GridServer")]
|
||||||
[assembly : AssemblyDescription("")]
|
[assembly : AssemblyDescription("")]
|
||||||
[assembly : AssemblyConfiguration("")]
|
[assembly : AssemblyConfiguration("")]
|
||||||
[assembly : AssemblyCompany("")]
|
[assembly : AssemblyCompany("")]
|
||||||
[assembly : AssemblyProduct("OGS-GridServer")]
|
[assembly : AssemblyProduct("OGS-GridServer")]
|
||||||
[assembly : AssemblyCopyright("Copyright © 2007")]
|
[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
|
||||||
[assembly : AssemblyTrademark("")]
|
[assembly : AssemblyTrademark("")]
|
||||||
[assembly : AssemblyCulture("")]
|
[assembly : AssemblyCulture("")]
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
// Setting ComVisible to false makes the types in this assembly not visible
|
||||||
// to COM components. If you need to access a type in this assembly from
|
// to COM components. If you need to access a type in this assembly from
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
|
|
||||||
[assembly : ComVisible(false)]
|
[assembly : ComVisible(false)]
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
|
|
||||||
[assembly : Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
|
[assembly : Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
// Version information for an assembly consists of the following four values:
|
||||||
//
|
//
|
||||||
// Major Version
|
// Major Version
|
||||||
// Minor Version
|
// Minor Version
|
||||||
// Build Number
|
// Build Number
|
||||||
// Revision
|
// Revision
|
||||||
//
|
//
|
||||||
|
|
||||||
[assembly : AssemblyVersion("1.0.0.0")]
|
[assembly : AssemblyVersion("1.0.0.0")]
|
||||||
[assembly : AssemblyFileVersion("1.0.0.0")]
|
[assembly : AssemblyFileVersion("1.0.0.0")]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue