diff options
author | Jeff Ames | 2008-05-30 08:35:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-30 08:35:57 +0000 |
commit | 04625109560fb54d613b1fc9c81a8a9f387720c9 (patch) | |
tree | af00035a676beee3542a55cd13ce09e57f1ad778 /OpenSim/Data/MySQL/MySQLLogData.cs | |
parent | thanks krtaylor for a (diff) | |
download | opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.zip opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.gz opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.bz2 opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLogData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLogData.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index 0873066..2bd246a 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Data.MySQL | |||
34 | /// An interface to the log database for MySQL | 34 | /// An interface to the log database for MySQL |
35 | /// </summary> | 35 | /// </summary> |
36 | internal class MySQLLogData : ILogData | 36 | internal class MySQLLogData : ILogData |
37 | { | 37 | { |
38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | /// <summary> | 39 | /// <summary> |
40 | /// The database manager | 40 | /// The database manager |
@@ -46,9 +46,12 @@ namespace OpenSim.Data.MySQL | |||
46 | /// </summary> | 46 | /// </summary> |
47 | public void Initialise(string connect) | 47 | public void Initialise(string connect) |
48 | { | 48 | { |
49 | if (connect != String.Empty) { | 49 | if (connect != String.Empty) |
50 | { | ||
50 | database = new MySQLManager(connect); | 51 | database = new MySQLManager(connect); |
51 | } else { | 52 | } |
53 | else | ||
54 | { | ||
52 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); | 55 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
53 | 56 | ||
54 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 57 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
@@ -59,9 +62,8 @@ namespace OpenSim.Data.MySQL | |||
59 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); | 62 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); |
60 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); | 63 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); |
61 | 64 | ||
62 | database = | 65 | database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, |
63 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, | 66 | settingPooling, settingPort); |
64 | settingPort); | ||
65 | } | 67 | } |
66 | } | 68 | } |
67 | 69 | ||