From 5f763f47a65df9adcc9615ec112f0cf2050cacd4 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 7 Jul 2017 11:07:52 -0400 Subject: [PATCH] Cleanup from db31558 --- BNetServer/BNetServer.conf.dist | 6 ------ Framework/Database/DatabaseLoader.cs | 20 +++++++++--------- Framework/Database/MySqlBase.cs | 31 ---------------------------- WorldServer/WorldServer.conf.dist | 6 ------ 4 files changed, 10 insertions(+), 53 deletions(-) diff --git a/BNetServer/BNetServer.conf.dist b/BNetServer/BNetServer.conf.dist index 52a0636c4..50ca5244c 100644 --- a/BNetServer/BNetServer.conf.dist +++ b/BNetServer/BNetServer.conf.dist @@ -85,12 +85,6 @@ WrongPass.BanType = 0 # LoginDatabaseInfo # Description: Database connection settings for the realm server. # Example: "hostname;port;username;password;database" -# ".;somenumber;username;password;database" - (Use named pipes on Windows -# "enable-named-pipe" to [mysqld] -# section my.ini) -# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on -# Unix/Linux) -# Default: "127.0.0.1;3306;username;password;auth" LoginDatabaseInfo.Host = "127.0.0.1" LoginDatabaseInfo.Port = "3306" diff --git a/Framework/Database/DatabaseLoader.cs b/Framework/Database/DatabaseLoader.cs index e1d146c95..b5524bf79 100644 --- a/Framework/Database/DatabaseLoader.cs +++ b/Framework/Database/DatabaseLoader.cs @@ -35,16 +35,16 @@ namespace Framework.Database bool updatesEnabled = database.IsAutoUpdateEnabled(_updateFlags); _open.Add(() => { - ConnectionObject co = new ConnectionObject - { - Database = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Database", ""), - Host = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Host", ""), - Password = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Password", ""), - Port = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Port", ""), - Username = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Username", "") - }; + ConnectionObject connectionObject = new ConnectionObject + { + Database = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Database", ""), + Host = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Host", ""), + Password = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Password", ""), + Port = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Port", ""), + Username = ConfigMgr.GetDefaultValue(name + "DatabaseInfo.Username", "") + }; - var error = database.Initialize(co); + var error = database.Initialize(connectionObject); if (error != MySqlErrorCode.None) { // Database does not exist @@ -59,7 +59,7 @@ namespace Framework.Database Log.outInfo(LogFilter.ServerLoading, "Creating database \"{0}\"...", name); string sqlString = string.Format("CREATE DATABASE `{0}` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci", name); // Try to create the database and connect again if auto setup is enabled - if (database.Apply(sqlString) && database.Initialize(co) == MySqlErrorCode.None) + if (database.Apply(sqlString) && database.Initialize(connectionObject) == MySqlErrorCode.None) error = MySqlErrorCode.None; } diff --git a/Framework/Database/MySqlBase.cs b/Framework/Database/MySqlBase.cs index f54dbd0ec..4f359f53a 100644 --- a/Framework/Database/MySqlBase.cs +++ b/Framework/Database/MySqlBase.cs @@ -28,17 +28,6 @@ namespace Framework.Database { public class MySqlConnectionInfo { - public MySqlConnectionInfo(string info, int poolSize = 10) - { - var lines = new StringArray(info, ';'); - Host = lines[0]; - Port = lines[1]; - Username = lines[2]; - Password = lines[3]; - Database = lines[4]; - Poolsize = poolSize; - } - public MySqlConnectionInfo(ConnectionObject connectionObject, int poolSize = 10) { Host = connectionObject.Host; @@ -71,26 +60,6 @@ namespace Framework.Database public abstract class MySqlBase { - public MySqlErrorCode Initialize(string infoString) - { - _connectionInfo = new MySqlConnectionInfo(infoString); - _updater = new DatabaseUpdater(this); - - using (var connection = _connectionInfo.GetConnection()) - { - try - { - connection.Open(); - Log.outInfo(LogFilter.SqlDriver, "Connected to MySQL(ver: {0}) Database: {1}", connection.ServerVersion, _connectionInfo.Database); - return MySqlErrorCode.None; - } - catch (MySqlException ex) - { - return (MySqlErrorCode)((MySqlException)ex.InnerException).Number; - } - } - } - public MySqlErrorCode Initialize(ConnectionObject connectionObject) { _connectionInfo = new MySqlConnectionInfo(connectionObject); diff --git a/WorldServer/WorldServer.conf.dist b/WorldServer/WorldServer.conf.dist index 754c00c03..a8974465c 100644 --- a/WorldServer/WorldServer.conf.dist +++ b/WorldServer/WorldServer.conf.dist @@ -35,12 +35,6 @@ LogsDir = "./Logs" # WorldDatabaseInfo # CharacterDatabaseInfo # Description: Database connection settings for the world server. -# Example: "hostname;port;username;password;database" - -# Default: "127.0.0.1;3306;username;password;auth" - (LoginDatabaseInfo) -# "127.0.0.1;3306;username;password;world" - (WorldDatabaseInfo) -# "127.0.0.1;3306;username;password;characters" - (CharacterDatabaseInfo) -# "127.0.0.1;3306;username;password;hotfixes" - (HotfixDatabaseInfo) LoginDatabaseInfo.Host = "127.0.0.1" LoginDatabaseInfo.Port = "3306"