diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer.Config/DbGridConfig.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer.Config/DbUserConfig.cs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs index d81e5cc..050df83 100644 --- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs +++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs | |||
@@ -63,7 +63,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
63 | /// User configuration for the Grid Config interfaces | 63 | /// User configuration for the Grid Config interfaces |
64 | /// </summary> | 64 | /// </summary> |
65 | public void LoadDefaults() { | 65 | public void LoadDefaults() { |
66 | MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); | 66 | MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); |
67 | 67 | ||
68 | // About the grid options | 68 | // About the grid options |
69 | this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); | 69 | this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); |
@@ -95,7 +95,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
95 | IObjectSet result = db.Get(typeof(DbGridConfig)); | 95 | IObjectSet result = db.Get(typeof(DbGridConfig)); |
96 | // Found? | 96 | // Found? |
97 | if(result.Count==1) { | 97 | if(result.Count==1) { |
98 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); | 98 | MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Found a GridConfig object in the local database, loading"); |
99 | foreach (DbGridConfig cfg in result) { | 99 | foreach (DbGridConfig cfg in result) { |
100 | // Import each setting into this class | 100 | // Import each setting into this class |
101 | // Grid Settings | 101 | // Grid Settings |
@@ -114,7 +114,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
114 | } | 114 | } |
115 | // Create a new configuration object from this class | 115 | // Create a new configuration object from this class |
116 | } else { | 116 | } else { |
117 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); | 117 | MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); |
118 | 118 | ||
119 | // Load default settings into this class | 119 | // Load default settings into this class |
120 | LoadDefaults(); | 120 | LoadDefaults(); |
@@ -127,7 +127,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
127 | db.Close(); | 127 | db.Close(); |
128 | } | 128 | } |
129 | } catch(Exception e) { | 129 | } catch(Exception e) { |
130 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 130 | MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured"); |
131 | MainLog.Instance.Warn(e.ToString()); | 131 | MainLog.Instance.Warn(e.ToString()); |
132 | } | 132 | } |
133 | 133 | ||
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs index cb0dbdd..1f93779 100644 --- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs +++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs | |||
@@ -47,7 +47,7 @@ namespace OpenUser.Config.UserConfigDb4o | |||
47 | private IObjectContainer db; | 47 | private IObjectContainer db; |
48 | 48 | ||
49 | public void LoadDefaults() { | 49 | public void LoadDefaults() { |
50 | MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); | 50 | MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); |
51 | 51 | ||
52 | this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); | 52 | this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); |
53 | 53 | ||
@@ -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 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); | 64 | MainLog.Instance.Verbose("DbUserConfig.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,14 +69,14 @@ namespace OpenUser.Config.UserConfigDb4o | |||
69 | this.DefaultStartupMsg=cfg.DefaultStartupMsg; | 69 | this.DefaultStartupMsg=cfg.DefaultStartupMsg; |
70 | } | 70 | } |
71 | } else { | 71 | } else { |
72 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); | 72 | MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); |
73 | LoadDefaults(); | 73 | LoadDefaults(); |
74 | MainLog.Instance.Verbose("Writing out default settings to local database"); | 74 | 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 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 79 | MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured"); |
80 | MainLog.Instance.Warn(e.ToString()); | 80 | MainLog.Instance.Warn(e.ToString()); |
81 | } | 81 | } |
82 | 82 | ||