cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed logs on lobby.

Browse Source
This commit is contained in:
Filip Maj 2016-06-15 20:06:08 -04:00
parent 9b3712044d
commit fbf6810c5c
5 changed files with 66 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FFXIVClassic Lobby Server/ConfigConstants.cs
View File

@ -18,11 +18,11 @@ namespace FFXIVClassic_Lobby_Server
public static bool Load() 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")) if (!File.Exists("./lobby_config.ini"))
{ {
Program.Log.Error("[FILE NOT FOUND]"); Program.Log.Error("FILE NOT FOUND!");
return false; return false;
} }
@ -38,8 +38,6 @@ namespace FFXIVClassic_Lobby_Server
ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", ""); ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", "");
ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", ""); ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", "");
Program.Log.Info("[OK]");
return true; return true;
} }
} }

123
FFXIVClassic Lobby Server/Program.cs
View File

@ -1,66 +1,65 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Threading; using System.Threading;
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
using System.Reflection; using System.Reflection;
using FFXIVClassic.Common; using FFXIVClassic.Common;
using NLog; using NLog;
namespace FFXIVClassic_Lobby_Server namespace FFXIVClassic_Lobby_Server
{ {
class Program class Program
{ {
public static Logger Log; public static Logger Log;
static void Main(string[] args) static void Main(string[] args)
{ {
// set up logging // set up logging
Log = LogManager.GetCurrentClassLogger(); Log = LogManager.GetCurrentClassLogger();
#if DEBUG #if DEBUG
TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out); TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out);
Debug.Listeners.Add(myWriter); Debug.Listeners.Add(myWriter);
#endif #endif
Program.Log.Info("--------FFXIV 1.0 Lobby Server--------"); Console.ForegroundColor = ConsoleColor.Yellow;
Console.WriteLine("--------FFXIV 1.0 Lobby Server--------");
bool startServer = true; Console.ForegroundColor = ConsoleColor.Gray;
//Load Config bool startServer = true;
if (!ConfigConstants.Load())
startServer = false; //Load Config
if (!ConfigConstants.Load())
Assembly assem = Assembly.GetExecutingAssembly(); startServer = false;
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);
//Test 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)))
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
{ {
try conn.Open();
{ conn.Close();
conn.Open();
conn.Close(); Program.Log.Info("Connection ok.");
}
Program.Log.Info("Connection ok."); catch (MySqlException e)
} {
catch (MySqlException e) Program.Log.Error(e.ToString());
{ startServer = false;
Program.Log.Error(e.ToString()); }
startServer = false; }
}
} //Start Server if A-OK
if (startServer)
//Start Server if A-OK {
if (startServer) Server server = new Server();
{ server.StartServer();
Server server = new Server(); while (true) Thread.Sleep(10000);
server.StartServer(); }
}
Program.Log.Info("Press any key to continue...");
Program.Log.Info("Press any key to continue..."); Console.ReadKey();
Console.ReadKey(); }
}
}
} }
}

2
FFXIVClassic Lobby Server/Server.cs
View File

@ -81,7 +81,7 @@ namespace FFXIVClassic_Lobby_Server
} }
Console.ForegroundColor = ConsoleColor.White; 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; Console.ForegroundColor = ConsoleColor.Gray;
mProcessor = new PacketProcessor(); mProcessor = new PacketProcessor();

2
data/lobby_config.ini
View File

@ -8,4 +8,4 @@ host=127.0.0.1
port=3306 port=3306
database=ffxiv_server database=ffxiv_server
username=root username=root
password=root password=

2
data/map_config.ini
View File

@ -8,4 +8,4 @@ host=127.0.0.1
port=3306 port=3306
database=ffxiv_server database=ffxiv_server
username=root username=root
password=root password=