From 04625109560fb54d613b1fc9c81a8a9f387720c9 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 30 May 2008 08:35:57 +0000 Subject: Update svn properties. Formatting cleanup. --- OpenSim/Data/MySQL/MySQLGridData.cs | 12 +++++++----- OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +- OpenSim/Data/MySQL/MySQLLogData.cs | 14 ++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 421c283..86ceffc 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs @@ -53,9 +53,12 @@ namespace OpenSim.Data.MySQL /// override public void Initialise(string connect) { - if (connect != String.Empty) { + if (connect != String.Empty) + { database = new MySQLManager(connect); - } else { + } + else + { m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); @@ -65,9 +68,8 @@ namespace OpenSim.Data.MySQL string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); - database = - new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, - settingPort); + database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, + settingPooling, settingPort); } TestTables(); diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 74afe4f..8e160b7 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -50,7 +50,7 @@ namespace OpenSim.Data.MySQL public void Initialise(string connect) { - if(connect != String.Empty) + if (connect != String.Empty) { database = new MySQLManager(connect); } 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 /// An interface to the log database for MySQL /// internal class MySQLLogData : ILogData - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// The database manager @@ -46,9 +46,12 @@ namespace OpenSim.Data.MySQL /// public void Initialise(string connect) { - if (connect != String.Empty) { + if (connect != String.Empty) + { database = new MySQLManager(connect); - } else { + } + else + { m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); @@ -59,9 +62,8 @@ namespace OpenSim.Data.MySQL string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); - database = - new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, - settingPort); + database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, + settingPooling, settingPort); } } -- cgit v1.1