mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 20:05:33 +08:00
removed obsolete Verbose() function
This commit is contained in:
@@ -36,126 +36,135 @@ namespace OpenGrid.Config.GridConfigDb4o
|
||||
/// <summary>
|
||||
/// A grid configuration interface for returning the DB4o Config Provider
|
||||
/// </summary>
|
||||
public class Db40ConfigPlugin: IGridConfig
|
||||
{
|
||||
public class Db40ConfigPlugin: IGridConfig
|
||||
{
|
||||
/// <summary>
|
||||
/// Loads and returns a configuration objeect
|
||||
/// </summary>
|
||||
/// <returns>A grid configuration object</returns>
|
||||
public GridConfig GetConfigObject()
|
||||
{
|
||||
MainLog.Instance.Verbose("Loading Db40Config dll");
|
||||
return ( new DbGridConfig());
|
||||
}
|
||||
}
|
||||
public GridConfig GetConfigObject()
|
||||
{
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Loading Db40Config dll");
|
||||
return new DbGridConfig();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A DB4o based Gridserver configuration object
|
||||
/// </summary>
|
||||
public class DbGridConfig : GridConfig
|
||||
{
|
||||
public class DbGridConfig : GridConfig
|
||||
{
|
||||
/// <summary>
|
||||
/// The DB4o Database
|
||||
/// </summary>
|
||||
private IObjectContainer db;
|
||||
private IObjectContainer db;
|
||||
|
||||
/// <summary>
|
||||
/// User configuration for the Grid Config interfaces
|
||||
/// </summary>
|
||||
public void LoadDefaults() {
|
||||
MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||
public void LoadDefaults()
|
||||
{
|
||||
MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
|
||||
|
||||
// About the grid options
|
||||
this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
|
||||
this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
|
||||
|
||||
// Asset Options
|
||||
this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
|
||||
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");
|
||||
this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
|
||||
|
||||
// User Server Options
|
||||
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");
|
||||
this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user 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");
|
||||
this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
|
||||
|
||||
// Region Server Options
|
||||
this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null");
|
||||
this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initialises a new configuration object
|
||||
/// </summary>
|
||||
public override void InitConfig() {
|
||||
try {
|
||||
public override void InitConfig()
|
||||
{
|
||||
try
|
||||
{
|
||||
// Perform Db4o initialisation
|
||||
db = Db4oFactory.OpenFile("opengrid.yap");
|
||||
db = Db4oFactory.OpenFile("opengrid.yap");
|
||||
|
||||
// Locate the grid configuration object
|
||||
IObjectSet result = db.Get(typeof(DbGridConfig));
|
||||
IObjectSet result = db.Get(typeof(DbGridConfig));
|
||||
// Found?
|
||||
if(result.Count==1) {
|
||||
MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Found a GridConfig object in the local database, loading");
|
||||
foreach (DbGridConfig cfg in result) {
|
||||
if (result.Count==1)
|
||||
{
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Found a GridConfig object in the local database, loading");
|
||||
foreach (DbGridConfig cfg in result)
|
||||
{
|
||||
// Import each setting into this class
|
||||
// Grid Settings
|
||||
this.GridOwner=cfg.GridOwner;
|
||||
this.GridOwner=cfg.GridOwner;
|
||||
// Asset Settings
|
||||
this.DefaultAssetServer=cfg.DefaultAssetServer;
|
||||
this.AssetSendKey=cfg.AssetSendKey;
|
||||
this.AssetRecvKey=cfg.AssetRecvKey;
|
||||
this.DefaultAssetServer=cfg.DefaultAssetServer;
|
||||
this.AssetSendKey=cfg.AssetSendKey;
|
||||
this.AssetRecvKey=cfg.AssetRecvKey;
|
||||
// User Settings
|
||||
this.DefaultUserServer=cfg.DefaultUserServer;
|
||||
this.UserSendKey=cfg.UserSendKey;
|
||||
this.UserRecvKey=cfg.UserRecvKey;
|
||||
this.DefaultUserServer=cfg.DefaultUserServer;
|
||||
this.UserSendKey=cfg.UserSendKey;
|
||||
this.UserRecvKey=cfg.UserRecvKey;
|
||||
// Region Settings
|
||||
this.SimSendKey=cfg.SimSendKey;
|
||||
this.SimRecvKey=cfg.SimRecvKey;
|
||||
}
|
||||
// Create a new configuration object from this class
|
||||
} else {
|
||||
MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
|
||||
this.SimSendKey=cfg.SimSendKey;
|
||||
this.SimRecvKey=cfg.SimRecvKey;
|
||||
}
|
||||
// Create a new configuration object from this class
|
||||
}
|
||||
else
|
||||
{
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Could not find object in database, loading precompiled defaults");
|
||||
|
||||
// Load default settings into this class
|
||||
LoadDefaults();
|
||||
LoadDefaults();
|
||||
|
||||
// Saves to the database file...
|
||||
MainLog.Instance.Verbose( "Writing out default settings to local database");
|
||||
db.Set(this);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Writing out default settings to local database");
|
||||
db.Set(this);
|
||||
|
||||
// Closes file locks
|
||||
db.Close();
|
||||
}
|
||||
} catch(Exception e) {
|
||||
MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
|
||||
db.Close();
|
||||
}
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
|
||||
MainLog.Instance.Warn(e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
// Grid Settings
|
||||
MainLog.Instance.Verbose("Grid settings loaded:");
|
||||
MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Grid settings loaded:");
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Grid owner: " + this.GridOwner);
|
||||
|
||||
// Asset Settings
|
||||
MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
|
||||
MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
|
||||
MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Default asset server: " + this.DefaultAssetServer);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to asset server: " + this.AssetSendKey);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from asset server: " + this.AssetRecvKey);
|
||||
|
||||
// User Settings
|
||||
MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
|
||||
MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
|
||||
MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Default user server: " + this.DefaultUserServer);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to user server: " + this.UserSendKey);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from user server: " + this.UserRecvKey);
|
||||
|
||||
// Region Settings
|
||||
MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
|
||||
MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
|
||||
}
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to sims: " + this.SimSendKey);
|
||||
MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from sims: " + this.SimRecvKey);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Closes down the database and releases filesystem locks
|
||||
/// </summary>
|
||||
public void Shutdown() {
|
||||
db.Close();
|
||||
}
|
||||
}
|
||||
|
||||
public void Shutdown()
|
||||
{
|
||||
db.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user