diff options
author | Adam Frisby | 2007-06-20 15:52:45 +0000 |
---|---|---|
committer | Adam Frisby | 2007-06-20 15:52:45 +0000 |
commit | a9e9bc83ef5f0d36551eee420da6c71df48ad489 (patch) | |
tree | a163fdfd8ef882b190f54ff02c97a3a2949b096d /OpenGridServices/OpenUser.Config/UserConfigDb4o | |
parent | * Replaced old logging mechanism with new shiny logging mechanism (diff) | |
download | opensim-SC-a9e9bc83ef5f0d36551eee420da6c71df48ad489.zip opensim-SC-a9e9bc83ef5f0d36551eee420da6c71df48ad489.tar.gz opensim-SC-a9e9bc83ef5f0d36551eee420da6c71df48ad489.tar.bz2 opensim-SC-a9e9bc83ef5f0d36551eee420da6c71df48ad489.tar.xz |
* and done the same for OGS..
Diffstat (limited to 'OpenGridServices/OpenUser.Config/UserConfigDb4o')
-rw-r--r-- | OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs index fe0e7aa..770a6b9 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs | |||
@@ -37,7 +37,7 @@ namespace OpenUser.Config.UserConfigDb4o | |||
37 | { | 37 | { |
38 | public UserConfig GetConfigObject() | 38 | public UserConfig GetConfigObject() |
39 | { | 39 | { |
40 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loading Db40Config dll"); | 40 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Loading Db40Config dll"); |
41 | return ( new DbUserConfig()); | 41 | return ( new DbUserConfig()); |
42 | } | 42 | } |
43 | } | 43 | } |
@@ -47,13 +47,13 @@ namespace OpenUser.Config.UserConfigDb4o | |||
47 | private IObjectContainer db; | 47 | private IObjectContainer db; |
48 | 48 | ||
49 | public void LoadDefaults() { | 49 | public void LoadDefaults() { |
50 | OpenSim.Framework.Console.MainConsole.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); | 50 | OpenSim.Framework.Console.MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); |
51 | 51 | ||
52 | this.DefaultStartupMsg = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); | 52 | this.DefaultStartupMsg = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); |
53 | 53 | ||
54 | this.GridServerURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); | 54 | this.GridServerURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); |
55 | this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null"); | 55 | this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server","null"); |
56 | this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null"); | 56 | this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server","null"); |
57 | } | 57 | } |
58 | 58 | ||
59 | public override void InitConfig() { | 59 | public override void InitConfig() { |
@@ -61,7 +61,7 @@ namespace OpenUser.Config.UserConfigDb4o | |||
61 | db = Db4oFactory.OpenFile("openuser.yap"); | 61 | db = Db4oFactory.OpenFile("openuser.yap"); |
62 | IObjectSet result = db.Get(typeof(DbUserConfig)); | 62 | IObjectSet result = db.Get(typeof(DbUserConfig)); |
63 | if(result.Count==1) { | 63 | if(result.Count==1) { |
64 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); | 64 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); |
65 | foreach (DbUserConfig cfg in result) { | 65 | foreach (DbUserConfig cfg in result) { |
66 | this.GridServerURL=cfg.GridServerURL; | 66 | this.GridServerURL=cfg.GridServerURL; |
67 | this.GridSendKey=cfg.GridSendKey; | 67 | this.GridSendKey=cfg.GridSendKey; |
@@ -69,22 +69,22 @@ namespace OpenUser.Config.UserConfigDb4o | |||
69 | this.DefaultStartupMsg=cfg.DefaultStartupMsg; | 69 | this.DefaultStartupMsg=cfg.DefaultStartupMsg; |
70 | } | 70 | } |
71 | } else { | 71 | } else { |
72 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); | 72 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); |
73 | LoadDefaults(); | 73 | LoadDefaults(); |
74 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Writing out default settings to local database"); | 74 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Writing out default settings to local database"); |
75 | db.Set(this); | 75 | db.Set(this); |
76 | db.Close(); | 76 | db.Close(); |
77 | } | 77 | } |
78 | } catch(Exception e) { | 78 | } catch(Exception e) { |
79 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 79 | OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); |
80 | OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString()); | 80 | OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); |
81 | } | 81 | } |
82 | 82 | ||
83 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("User settings loaded:"); | 83 | OpenSim.Framework.Console.MainLog.Instance.Verbose("User settings loaded:"); |
84 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg); | 84 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg); |
85 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Grid server URL: " + this.GridServerURL); | 85 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL); |
86 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to send to grid: " + this.GridSendKey); | 86 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey); |
87 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey); | 87 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey); |
88 | } | 88 | } |
89 | 89 | ||
90 | 90 | ||