EXTERM-INATED. (Add warnings produced by WriteLine change have been updated to include Log Priority)

author: Adam Frisby 2007-05-12 15:44:10 +0000
committer: Adam Frisby 2007-05-12 15:44:10 +0000
commit: ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d (patch)
tree: 569da9ef2e6e528ea799d8c7e1eac637cdffa889 /OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
parent: 93 warnings in the compiler, 93 warnings appear, you fix one up, create two m... (diff)
download: opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.zip
opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.gz
opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.bz2
opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.xz
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index b1fb8bb..2d00ca6 100644
--- a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -36,7 +36,7 @@ namespace OpenGrid.Config.GridConfigDb4o
        {
                public GridConfig GetConfigObject()
                {
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll");
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll");
                        return ( new DbGridConfig());
                }
        }
@@ -46,7 +46,7 @@ namespace OpenGrid.Config.GridConfigDb4o
                private IObjectContainer db;    
                
                public void LoadDefaults() {
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
                        
                        this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
@@ -67,7 +67,7 @@ namespace OpenGrid.Config.GridConfigDb4o
                                db = Db4oFactory.OpenFile("opengrid.yap");
                                IObjectSet result = db.Get(typeof(DbGridConfig));
                                if(result.Count==1) {
-                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
+                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
                                        foreach (DbGridConfig cfg in result) {
                                                this.GridOwner=cfg.GridOwner;
                                                this.DefaultAssetServer=cfg.DefaultAssetServer;
@@ -80,27 +80,27 @@ namespace OpenGrid.Config.GridConfigDb4o
                                                this.SimRecvKey=cfg.SimRecvKey;
                                        }
                                } else {
-                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
                                        LoadDefaults();
-                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Writing out default settings to local database");
+                                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Writing out default settings to local database");
                                        db.Set(this);
                                        db.Close();
                                }
                        } catch(Exception e) {
-                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured");
+                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
-                                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
                        }
                        
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid settings loaded:");
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid settings loaded:");
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid owner: " + this.GridOwner);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid owner: " + this.GridOwner);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default asset server: " + this.DefaultAssetServer);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default asset server: " + this.DefaultAssetServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to asset server: " + this.AssetSendKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to asset server: " + this.AssetSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from asset server: " + this.AssetRecvKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from asset server: " + this.AssetRecvKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default user server: " + this.DefaultUserServer);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default user server: " + this.DefaultUserServer);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to user server: " + this.UserSendKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to user server: " + this.UserSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from user server: " + this.UserRecvKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from user server: " + this.UserRecvKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to sims: " + this.SimSendKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to sims: " + this.SimSendKey);
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from sims: " + this.SimRecvKey);
+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from sims: " + this.SimRecvKey);
                }
author	Adam Frisby	2007-05-12 15:44:10 +0000
committer	Adam Frisby	2007-05-12 15:44:10 +0000
commit	ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d (patch)
tree	569da9ef2e6e528ea799d8c7e1eac637cdffa889 /OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
parent	93 warnings in the compiler, 93 warnings appear, you fix one up, create two m... (diff)
download	opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.zip opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.gz opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.bz2 opensim-SC_OLD-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.xz

diff --git a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs index b1fb8bb..2d00ca6 100644 --- a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs +++ b/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
@@ -36,7 +36,7 @@ namespace OpenGrid.Config.GridConfigDb4o
36	{	36	{
37	public GridConfig GetConfigObject()	37	public GridConfig GetConfigObject()
38	{	38	{
39	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll");	39	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loading Db40Config dll");
40	return ( new DbGridConfig());	40	return ( new DbGridConfig());
41	}	41	}
42	}	42	}
@@ -46,7 +46,7 @@ namespace OpenGrid.Config.GridConfigDb4o
46	private IObjectContainer db;	46	private IObjectContainer db;
47		47
48	public void LoadDefaults() {	48	public void LoadDefaults() {
49	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");	49	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
50		50
51	this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");	51	this.GridOwner = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid owner", "OGS development team");
52		52
@@ -67,7 +67,7 @@ namespace OpenGrid.Config.GridConfigDb4o
67	db = Db4oFactory.OpenFile("opengrid.yap");	67	db = Db4oFactory.OpenFile("opengrid.yap");
68	IObjectSet result = db.Get(typeof(DbGridConfig));	68	IObjectSet result = db.Get(typeof(DbGridConfig));
69	if(result.Count==1) {	69	if(result.Count==1) {
70	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");	70	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Found a GridConfig object in the local database, loading");
71	foreach (DbGridConfig cfg in result) {	71	foreach (DbGridConfig cfg in result) {
72	this.GridOwner=cfg.GridOwner;	72	this.GridOwner=cfg.GridOwner;
73	this.DefaultAssetServer=cfg.DefaultAssetServer;	73	this.DefaultAssetServer=cfg.DefaultAssetServer;
@@ -80,27 +80,27 @@ namespace OpenGrid.Config.GridConfigDb4o
80	this.SimRecvKey=cfg.SimRecvKey;	80	this.SimRecvKey=cfg.SimRecvKey;
81	}	81	}
82	} else {	82	} else {
83	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");	83	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
84	LoadDefaults();	84	LoadDefaults();
85	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Writing out default settings to local database");	85	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Writing out default settings to local database");
86	db.Set(this);	86	db.Set(this);
87	db.Close();	87	db.Close();
88	}	88	}
89	} catch(Exception e) {	89	} catch(Exception e) {
90	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured");	90	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
91	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());	91	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
92	}	92	}
93		93
94	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid settings loaded:");	94	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid settings loaded:");
95	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid owner: " + this.GridOwner);	95	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Grid owner: " + this.GridOwner);
96	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default asset server: " + this.DefaultAssetServer);	96	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default asset server: " + this.DefaultAssetServer);
97	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to asset server: " + this.AssetSendKey);	97	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to asset server: " + this.AssetSendKey);
98	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from asset server: " + this.AssetRecvKey);	98	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from asset server: " + this.AssetRecvKey);
99	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Default user server: " + this.DefaultUserServer);	99	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Default user server: " + this.DefaultUserServer);
100	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to user server: " + this.UserSendKey);	100	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to user server: " + this.UserSendKey);
101	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from user server: " + this.UserRecvKey);	101	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from user server: " + this.UserRecvKey);
102	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to send to sims: " + this.SimSendKey);	102	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to send to sims: " + this.SimSendKey);
103	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Key to expect from sims: " + this.SimRecvKey);	103	OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Key to expect from sims: " + this.SimRecvKey);
104	}	104	}
105		105
106		106