* Fixed OGS build

* Converted to new console interfaces * Fixed other minor issues which somehow snuck in
author: Adam Frisby 2007-06-05 13:18:44 +0000
committer: Adam Frisby 2007-06-05 13:18:44 +0000
commit: 75f9b25b41b5a80025e17808b5b2d9fe7295d54e (patch)
tree: cd96e948447cc9a030c7ce537d25da06ea40db5e /OpenGridServices/OpenGrid.Config
parent: * "We are" message is now a status text message. (diff)
download: opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.zip
opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.gz
opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.bz2
opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.xz
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index cbe64e6..19cf6ac 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -43,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o
        /// <returns>A grid configuration object</returns>
                public GridConfig GetConfigObject()
                {
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll");
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
                        return ( new DbGridConfig());
                }
        }
@@ -62,7 +62,7 @@ namespace OpenGrid.Config.GridConfigDb4o
        /// User configuration for the Grid Config interfaces
        /// </summary>
                public void LoadDefaults() {
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+                        OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
                        
            // About the grid options
                        this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
@@ -94,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o
                                IObjectSet result = db.Get(typeof(DbGridConfig));
                // Found?
                                if(result.Count==1) {
-                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
+                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
                                        foreach (DbGridConfig cfg in result) {
                        // Import each setting into this class
                        // Grid Settings
@@ -113,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o
                                        }
                // Create a new configuration object from this class
                                } else {
-                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+                                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
                    // Load default settings into this class
                                        LoadDefaults();
                    // Saves to the database file...
-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Writing out default settings to local database");
+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Writing out default settings to local database");
                                        db.Set(this);
                    // Closes file locks
                                        db.Close();
                                }
                        } catch(Exception e) {
-                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
+                                OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
                        }
                        
            // Grid Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid settings loaded:");
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid settings loaded:");
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid owner: " + this.GridOwner);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid owner: " + this.GridOwner);
            // Asset Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default asset server: " + this.DefaultAssetServer);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to asset server: " + this.AssetSendKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from asset server: " + this.AssetRecvKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
            // User Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default user server: " + this.DefaultUserServer);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default user server: " + this.DefaultUserServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to user server: " + this.UserSendKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from user server: " + this.UserRecvKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
            // Region Settings
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to sims: " + this.SimSendKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from sims: " + this.SimRecvKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
                }
        
        /// <summary>
author	Adam Frisby	2007-06-05 13:18:44 +0000
committer	Adam Frisby	2007-06-05 13:18:44 +0000
commit	75f9b25b41b5a80025e17808b5b2d9fe7295d54e (patch)
tree	cd96e948447cc9a030c7ce537d25da06ea40db5e /OpenGridServices/OpenGrid.Config
parent	* "We are" message is now a status text message. (diff)
download	opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.zip opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.gz opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.bz2 opensim-SC_OLD-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.xz

diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs index cbe64e6..19cf6ac 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -43,7 +43,7 @@ namespace OpenGrid.Config.GridConfigDb4o
43	/// <returns>A grid configuration object</returns>	43	/// <returns>A grid configuration object</returns>
44	public GridConfig GetConfigObject()	44	public GridConfig GetConfigObject()
45	{	45	{
46	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll");	46	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll");
47	return ( new DbGridConfig());	47	return ( new DbGridConfig());
48	}	48	}
49	}	49	}
@@ -62,7 +62,7 @@ namespace OpenGrid.Config.GridConfigDb4o
62	/// User configuration for the Grid Config interfaces	62	/// User configuration for the Grid Config interfaces
63	/// </summary>	63	/// </summary>
64	public void LoadDefaults() {	64	public void LoadDefaults() {
65	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");	65	OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
66		66
67	// About the grid options	67	// About the grid options
68	this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");	68	this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
@@ -94,7 +94,7 @@ namespace OpenGrid.Config.GridConfigDb4o
94	IObjectSet result = db.Get(typeof(DbGridConfig));	94	IObjectSet result = db.Get(typeof(DbGridConfig));
95	// Found?	95	// Found?
96	if(result.Count==1) {	96	if(result.Count==1) {
97	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");	97	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
98	foreach (DbGridConfig cfg in result) {	98	foreach (DbGridConfig cfg in result) {
99	// Import each setting into this class	99	// Import each setting into this class
100	// Grid Settings	100	// Grid Settings
@@ -113,40 +113,40 @@ namespace OpenGrid.Config.GridConfigDb4o
113	}	113	}
114	// Create a new configuration object from this class	114	// Create a new configuration object from this class
115	} else {	115	} else {
116	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");	116	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
117		117
118	// Load default settings into this class	118	// Load default settings into this class
119	LoadDefaults();	119	LoadDefaults();
120		120
121	// Saves to the database file...	121	// Saves to the database file...
122	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Writing out default settings to local database");	122	OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Writing out default settings to local database");
123	db.Set(this);	123	db.Set(this);
124		124
125	// Closes file locks	125	// Closes file locks
126	db.Close();	126	db.Close();
127	}	127	}
128	} catch(Exception e) {	128	} catch(Exception e) {
129	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");	129	OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
130	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());	130	OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
131	}	131	}
132		132
133	// Grid Settings	133	// Grid Settings
134	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid settings loaded:");	134	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid settings loaded:");
135	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid owner: " + this.GridOwner);	135	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid owner: " + this.GridOwner);
136		136
137	// Asset Settings	137	// Asset Settings
138	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default asset server: " + this.DefaultAssetServer);	138	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
139	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to asset server: " + this.AssetSendKey);	139	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
140	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from asset server: " + this.AssetRecvKey);	140	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
141		141
142	// User Settings	142	// User Settings
143	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default user server: " + this.DefaultUserServer);	143	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default user server: " + this.DefaultUserServer);
144	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to user server: " + this.UserSendKey);	144	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
145	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from user server: " + this.UserRecvKey);	145	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
146		146
147	// Region Settings	147	// Region Settings
148	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to sims: " + this.SimSendKey);	148	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
149	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from sims: " + this.SimRecvKey);	149	OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
150	}	150	}
151		151
152	/// <summary>	152	/// <summary>