diff --git a/FFXIVClassic Lobby Server/ConfigConstants.cs b/FFXIVClassic Lobby Server/ConfigConstants.cs index 02332dc0..358ceb96 100644 --- a/FFXIVClassic Lobby Server/ConfigConstants.cs +++ b/FFXIVClassic Lobby Server/ConfigConstants.cs @@ -18,11 +18,11 @@ namespace FFXIVClassic_Lobby_Server public static bool Load() { - Program.Log.Info("Loading lobby_config.ini file... "); + Program.Log.Info("Loading lobby_config.ini file"); if (!File.Exists("./lobby_config.ini")) { - Program.Log.Error("[FILE NOT FOUND]"); + Program.Log.Error("FILE NOT FOUND!"); return false; } @@ -38,8 +38,6 @@ namespace FFXIVClassic_Lobby_Server ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", ""); ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", ""); - Program.Log.Info("[OK]"); - return true; } } diff --git a/FFXIVClassic Lobby Server/Program.cs b/FFXIVClassic Lobby Server/Program.cs index c5967a87..0bfb56ee 100644 --- a/FFXIVClassic Lobby Server/Program.cs +++ b/FFXIVClassic Lobby Server/Program.cs @@ -1,66 +1,65 @@ -using System; -using System.Diagnostics; -using System.Threading; -using MySql.Data.MySqlClient; -using System.Reflection; -using FFXIVClassic.Common; -using NLog; -namespace FFXIVClassic_Lobby_Server -{ - class Program - { - public static Logger Log; - - static void Main(string[] args) +using System; +using System.Diagnostics; +using System.Threading; +using MySql.Data.MySqlClient; +using System.Reflection; +using FFXIVClassic.Common; +using NLog; +namespace FFXIVClassic_Lobby_Server +{ + class Program + { + public static Logger Log; + + static void Main(string[] args) { // set up logging - Log = LogManager.GetCurrentClassLogger(); -#if DEBUG - TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out); + Log = LogManager.GetCurrentClassLogger(); +#if DEBUG + TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out); Debug.Listeners.Add(myWriter); -#endif - Program.Log.Info("--------FFXIV 1.0 Lobby Server--------"); - - bool startServer = true; - - //Load Config - if (!ConfigConstants.Load()) - startServer = false; - - Assembly assem = Assembly.GetExecutingAssembly(); - Version vers = assem.GetName().Version; - Program.Log.Info("Version: " + vers.ToString()); - - //Test DB Connection - Program.Log.Info("Testing DB connection to \"{0}\"... ", ConfigConstants.DATABASE_HOST); - using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) - { - try - { - conn.Open(); - conn.Close(); - - Program.Log.Info("Connection ok."); - } - catch (MySqlException e) - { - Program.Log.Error(e.ToString()); - startServer = false; - } - } - - //Start Server if A-OK - if (startServer) - { - Server server = new Server(); - server.StartServer(); - } - - Program.Log.Info("Press any key to continue..."); - Console.ReadKey(); - } - - - } -} +#endif + Console.ForegroundColor = ConsoleColor.Yellow; + Console.WriteLine("--------FFXIV 1.0 Lobby Server--------"); + Console.ForegroundColor = ConsoleColor.Gray; + + bool startServer = true; + + //Load Config + if (!ConfigConstants.Load()) + startServer = false; + + //Test DB Connection + Program.Log.Info("Testing DB connection to \"{0}\"", ConfigConstants.DATABASE_HOST); + using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) + { + try + { + conn.Open(); + conn.Close(); + + Program.Log.Info("Connection ok."); + } + catch (MySqlException e) + { + Program.Log.Error(e.ToString()); + startServer = false; + } + } + + //Start Server if A-OK + if (startServer) + { + Server server = new Server(); + server.StartServer(); + while (true) Thread.Sleep(10000); + } + + Program.Log.Info("Press any key to continue..."); + Console.ReadKey(); + } + + + } +} diff --git a/FFXIVClassic Lobby Server/Server.cs b/FFXIVClassic Lobby Server/Server.cs index 20b08be8..e596ec26 100644 --- a/FFXIVClassic Lobby Server/Server.cs +++ b/FFXIVClassic Lobby Server/Server.cs @@ -81,7 +81,7 @@ namespace FFXIVClassic_Lobby_Server } Console.ForegroundColor = ConsoleColor.White; - Program.Log.Debug("Lobby Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port); + Program.Log.Info("Lobby Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port); Console.ForegroundColor = ConsoleColor.Gray; mProcessor = new PacketProcessor(); diff --git a/data/lobby_config.ini b/data/lobby_config.ini index f8aa676b..2251736f 100644 --- a/data/lobby_config.ini +++ b/data/lobby_config.ini @@ -8,4 +8,4 @@ host=127.0.0.1 port=3306 database=ffxiv_server username=root -password=root +password= diff --git a/data/map_config.ini b/data/map_config.ini index f8aa676b..2251736f 100644 --- a/data/map_config.ini +++ b/data/map_config.ini @@ -8,4 +8,4 @@ host=127.0.0.1 port=3306 database=ffxiv_server username=root -password=root +password=