diff --git a/FFXIVClassic Map Server/ConfigConstants.cs b/FFXIVClassic Map Server/ConfigConstants.cs index fde393f4..cf4006e6 100644 --- a/FFXIVClassic Map Server/ConfigConstants.cs +++ b/FFXIVClassic Map Server/ConfigConstants.cs @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server if (!File.Exists("./map_config.ini")) { - Program.Log.Error("[FILE NOT FOUND]"); + Program.Log.Error("FILE NOT FOUND"); return false; } @@ -39,9 +39,7 @@ namespace FFXIVClassic_Map_Server ConfigConstants.DATABASE_NAME = configIni.GetValue("Database", "database", ""); ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", ""); ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", ""); - - Program.Log.Info("[OK]"); - + return true; } } diff --git a/FFXIVClassic Map Server/Program.cs b/FFXIVClassic Map Server/Program.cs index eaaa6981..c18ef0c9 100644 --- a/FFXIVClassic Map Server/Program.cs +++ b/FFXIVClassic Map Server/Program.cs @@ -1,87 +1,85 @@ -using System; -using System.Diagnostics; -using System.Threading; -using System.Text; -using MySql.Data.MySqlClient; -using System.Reflection; -using FFXIVClassic_Map_Server.dataobjects; -using FFXIVClassic.Common; -using NLog; -using NLog.Targets; -using NLog.Targets.Wrappers; -using NLog.Config; - -namespace FFXIVClassic_Map_Server -{ - class Program - { - public static Logger Log; - - static void Main(string[] args) +using System; +using System.Diagnostics; +using System.Threading; +using System.Text; +using MySql.Data.MySqlClient; +using System.Reflection; +using FFXIVClassic_Map_Server.dataobjects; +using FFXIVClassic.Common; +using NLog; +using NLog.Targets; +using NLog.Targets.Wrappers; +using NLog.Config; + +namespace FFXIVClassic_Map_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); - Debug.Listeners.Add(myWriter); -#endif - bool startServer = true; - - Program.Log.Info("---------FFXIV 1.0 Map Server---------"); - - //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... "); - 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; - } - } - - //Check World ID - DBWorld thisWorld = Database.GetServer(ConfigConstants.DATABASE_WORLDID); - if (thisWorld != null) - Program.Log.Info("Successfully pulled world info from DB. Server name is {0}.", thisWorld.name); - else - Program.Log.Info("World info could not be retrieved from the DB. Welcome and MOTD will not be displayed."); - - //Start server if A-OK - if (startServer) - { - Server server = new Server(); - CommandProcessor cp = new CommandProcessor(server.GetConnectedPlayerList()); - server.StartServer(); - - while (startServer) - { - String input = Console.ReadLine(); - Log.Info("[Console Input] " + input); - cp.DoCommand(input, null); - } - } - - Program.Log.Info("Press any key to continue..."); - Console.ReadKey(); - } - - - } -} + Log = LogManager.GetCurrentClassLogger(); +#if DEBUG + TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out); + Debug.Listeners.Add(myWriter); +#endif + bool startServer = true; + + Console.ForegroundColor = ConsoleColor.Cyan; + Console.WriteLine("---------FFXIV 1.0 Map Server---------"); + Console.ForegroundColor = ConsoleColor.Gray; + + //Load Config + if (!ConfigConstants.Load()) + startServer = false; + + //Test DB Connection + Program.Log.Info("Testing DB connection... "); + 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; + } + } + + //Check World ID + DBWorld thisWorld = Database.GetServer(ConfigConstants.DATABASE_WORLDID); + if (thisWorld != null) + Program.Log.Info("Successfully pulled world info from DB. Server name is {0}.", thisWorld.name); + else + Program.Log.Info("World info could not be retrieved from the DB. Welcome and MOTD will not be displayed."); + + //Start server if A-OK + if (startServer) + { + Server server = new Server(); + CommandProcessor cp = new CommandProcessor(server.GetConnectedPlayerList()); + server.StartServer(); + + while (startServer) + { + String input = Console.ReadLine(); + Log.Info("[Console Input] " + input); + cp.DoCommand(input, null); + } + } + + Program.Log.Info("Press any key to continue..."); + Console.ReadKey(); + } + + + } +} diff --git a/FFXIVClassic Map Server/Server.cs b/FFXIVClassic Map Server/Server.cs index f5005496..e7f1f1be 100644 --- a/FFXIVClassic Map Server/Server.cs +++ b/FFXIVClassic Map Server/Server.cs @@ -116,7 +116,7 @@ namespace FFXIVClassic_Map_Server } Console.ForegroundColor = ConsoleColor.White; - Program.Log.Debug("Map Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port); + Program.Log.Info("Map Server has started @ {0}:{1}", (mServerSocket.LocalEndPoint as IPEndPoint).Address, (mServerSocket.LocalEndPoint as IPEndPoint).Port); Console.ForegroundColor = ConsoleColor.Gray; mProcessor = new PacketProcessor(this, mConnectedPlayerList, mConnectionList);