From 73599c0f25f67b6a2de61a36849bb8ce0b7b5279 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 6 Dec 2007 18:17:44 +0000 Subject: removed obsolete Verbose() function --- OpenSim/Grid/GridServer.Config/DbGridConfig.cs | 135 ++++++++++---------- OpenSim/Grid/UserServer.Config/DbUserConfig.cs | 164 +++++++++++++------------ 2 files changed, 158 insertions(+), 141 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs index 050df83..c04132a 100644 --- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs +++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs @@ -36,126 +36,135 @@ namespace OpenGrid.Config.GridConfigDb4o /// /// A grid configuration interface for returning the DB4o Config Provider /// - public class Db40ConfigPlugin: IGridConfig - { + public class Db40ConfigPlugin: IGridConfig + { /// /// Loads and returns a configuration objeect /// /// A grid configuration object - 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(); + } + } /// /// A DB4o based Gridserver configuration object /// - public class DbGridConfig : GridConfig - { + public class DbGridConfig : GridConfig + { /// /// The DB4o Database /// - private IObjectContainer db; + private IObjectContainer db; /// /// User configuration for the Grid Config interfaces /// - 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"); - } + } /// /// Initialises a new configuration object /// - 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); + } /// /// Closes down the database and releases filesystem locks /// - public void Shutdown() { - db.Close(); - } - } - + public void Shutdown() + { + db.Close(); + } + } } diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs index 1f93779..748973d 100644 --- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs +++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs @@ -1,30 +1,30 @@ /* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* 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 -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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 + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ using System; using Db4objects.Db4o; using OpenSim.Framework.Configuration; @@ -33,64 +33,72 @@ using OpenSim.Framework.Interfaces; namespace OpenUser.Config.UserConfigDb4o { - public class Db4oConfigPlugin: IUserConfig - { - public UserConfig GetConfigObject() - { - MainLog.Instance.Verbose("Loading Db40Config dll"); - return ( new DbUserConfig()); - } - } + public class Db4oConfigPlugin: IUserConfig + { + public UserConfig GetConfigObject() + { + MainLog.Instance.Verbose("DBUSERCONFIG", "Loading Db40Config dll"); + return ( new DbUserConfig()); + } + } - public class DbUserConfig : UserConfig - { - private IObjectContainer db; + public class DbUserConfig : UserConfig + { + private IObjectContainer db; - public void LoadDefaults() { - MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); + public void LoadDefaults() + { + MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); - this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); + this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); - this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/"); - this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null"); - this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); - } + this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/"); + this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null"); + this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); + } - public override void InitConfig() { - try { - db = Db4oFactory.OpenFile("openuser.yap"); - IObjectSet result = db.Get(typeof(DbUserConfig)); - if(result.Count==1) { - MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); - foreach (DbUserConfig cfg in result) { - this.GridServerURL=cfg.GridServerURL; - this.GridSendKey=cfg.GridSendKey; - this.GridRecvKey=cfg.GridRecvKey; - this.DefaultStartupMsg=cfg.DefaultStartupMsg; - } - } else { - MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); - LoadDefaults(); - MainLog.Instance.Verbose("Writing out default settings to local database"); - db.Set(this); - db.Close(); - } - } catch(Exception e) { - MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured"); + public override void InitConfig() + { + try + { + db = Db4oFactory.OpenFile("openuser.yap"); + IObjectSet result = db.Get(typeof(DbUserConfig)); + if(result.Count==1) + { + MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); + foreach (DbUserConfig cfg in result) + { + this.GridServerURL=cfg.GridServerURL; + this.GridSendKey=cfg.GridSendKey; + this.GridRecvKey=cfg.GridRecvKey; + this.DefaultStartupMsg=cfg.DefaultStartupMsg; + } + } + else + { + MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); + LoadDefaults(); + MainLog.Instance.Verbose("DBUSERCONFIG", "Writing out default settings to local database"); + db.Set(this); + db.Close(); + } + } + catch(Exception e) + { + MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured"); MainLog.Instance.Warn(e.ToString()); - } + } - MainLog.Instance.Verbose("User settings loaded:"); - MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg); - MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL); - MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey); - MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey); - } - - - public void Shutdown() { - db.Close(); - } - } + MainLog.Instance.Verbose("DBUSERCONFIG", "User settings loaded:"); + MainLog.Instance.Verbose("DBUSERCONFIG", "Default startup message: " + this.DefaultStartupMsg); + MainLog.Instance.Verbose("DBUSERCONFIG", "Grid server URL: " + this.GridServerURL); + MainLog.Instance.Verbose("DBUSERCONFIG", "Key to send to grid: " + this.GridSendKey); + MainLog.Instance.Verbose("DBUSERCONFIG", "Key to expect from grid: " + this.GridRecvKey); + } + public void Shutdown() + { + db.Close(); + } + } } -- cgit v1.1