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

moved stray console.writeline to use main logger

Browse Source
This commit is contained in:
Tahir Akhlaq 2016-06-15 19:14:21 +01:00
parent 1bac69c893
commit 1159c75ab8
8 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FFXIVClassic Lobby Server/ConfigConstants.cs
View File

@ -18,13 +18,11 @@ namespace FFXIVClassic_Lobby_Server
public static bool Load()
{
Console.Write("Loading lobby_config.ini file... ");
Program.Log.Info("Loading lobby_config.ini file... ");
if (!File.Exists("./lobby_config.ini"))
{
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine(String.Format("[FILE NOT FOUND]"));
Console.ForegroundColor = ConsoleColor.Gray;
Program.Log.Error("[FILE NOT FOUND]");
return false;
}
@ -40,9 +38,7 @@ namespace FFXIVClassic_Lobby_Server
ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", "");
ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", "");
Console.ForegroundColor = ConsoleColor.Green;
Console.WriteLine("[OK]");
Console.ForegroundColor = ConsoleColor.Gray;
Program.Log.Info("[OK]");
return true;
}

14
FFXIVClassic Lobby Server/Program.cs
View File

@ -12,23 +12,21 @@ namespace FFXIVClassic_Lobby_Server
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);
Debug.Listeners.Add(myWriter);
#endif
Console.ForegroundColor = ConsoleColor.Yellow;
Console.WriteLine("--------FFXIV 1.0 Lobby Server--------");
Console.ForegroundColor = ConsoleColor.Gray;
Program.Log.Info("--------FFXIV 1.0 Lobby Server--------");
bool startServer = true;
//Load Config
if (!ConfigConstants.Load())
startServer = false;
Log = LogManager.GetCurrentClassLogger();
Assembly assem = Assembly.GetExecutingAssembly();
Version vers = assem.GetName().Version;

9
FFXIVClassic Lobby Server/packets/BasePacket.cs
View File

@ -332,10 +332,11 @@ namespace FFXIVClassic_Lobby_Server.packets
#endregion
public void DebugPrintPacket()
{
{
#if DEBUG
Console.BackgroundColor = ConsoleColor.DarkYellow;
// todo: create new target for colourful packet logging
//Console.BackgroundColor = ConsoleColor.DarkYellow;
Program.Log.Debug("IsAuth: {0} Size: 0x{1:X}, NumSubpackets: {2}{3}{4}", header.isAuthenticated, header.packetSize, header.numSubpackets, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes()));
foreach (SubPacket sub in GetSubpackets())
@ -343,7 +344,7 @@ namespace FFXIVClassic_Lobby_Server.packets
sub.DebugPrintSubPacket();
}
Console.BackgroundColor = ConsoleColor.Black;
//Console.BackgroundColor = ConsoleColor.Black;
#endif
}

1
FFXIVClassic Lobby Server/packets/SubPacket.cs
View File

@ -140,6 +140,7 @@ namespace FFXIVClassic_Lobby_Server.packets
public void DebugPrintSubPacket()
{
#if DEBUG
// todo: create new target for colourful packet logging
Program.Log.Debug("Size: 0x{0:X}{1}{2}", header.subpacketSize, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes()));
if (header.type == 0x03)

10
FFXIVClassic Map Server/ConfigConstants.cs
View File

@ -19,13 +19,11 @@ namespace FFXIVClassic_Map_Server
public static bool Load()
{
Console.Write("Loading map_config.ini file... ");
Program.Log.Info("Loading map_config.ini file... ");
if (!File.Exists("./map_config.ini"))
{
Console.ForegroundColor = ConsoleColor.Red;
Console.WriteLine(String.Format("[FILE NOT FOUND]"));
Console.ForegroundColor = ConsoleColor.Gray;
Program.Log.Error("[FILE NOT FOUND]");
return false;
}
@ -42,9 +40,7 @@ namespace FFXIVClassic_Map_Server
ConfigConstants.DATABASE_USERNAME = configIni.GetValue("Database", "username", "");
ConfigConstants.DATABASE_PASSWORD = configIni.GetValue("Database", "password", "");
Console.ForegroundColor = ConsoleColor.Green;
Console.WriteLine("[OK]");
Console.ForegroundColor = ConsoleColor.Gray;
Program.Log.Info("[OK]");
return true;
}

13
FFXIVClassic Map Server/Program.cs
View File

@ -18,25 +18,22 @@ namespace FFXIVClassic_Map_Server
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;
Console.ForegroundColor = ConsoleColor.Cyan;
Console.WriteLine("---------FFXIV 1.0 Map Server---------");
Console.ForegroundColor = ConsoleColor.Gray;
Program.Log.Info("---------FFXIV 1.0 Map Server---------");
//Load Config
if (!ConfigConstants.Load())
startServer = false;
// set up logging
Log = LogManager.GetCurrentClassLogger();
Assembly assem = Assembly.GetExecutingAssembly();
Version vers = assem.GetName().Version;
Program.Log.Info("Version: " + vers.ToString());

5
FFXIVClassic Map Server/packets/BasePacket.cs
View File

@ -332,7 +332,8 @@ namespace FFXIVClassic_Map_Server.packets
public void DebugPrintPacket()
{
#if DEBUG
Console.BackgroundColor = ConsoleColor.DarkYellow;
// todo: create new target for colourful packet logging
//Console.BackgroundColor = ConsoleColor.DarkYellow;
Program.Log.Debug("IsAuth: {0} IsEncrypted: {1}, Size: 0x{2:X}, NumSubpackets: {3}{4}{5}", header.isAuthenticated, header.isCompressed, header.packetSize, header.numSubpackets, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes()));
@ -341,7 +342,7 @@ namespace FFXIVClassic_Map_Server.packets
sub.DebugPrintSubPacket();
}
Console.BackgroundColor = ConsoleColor.Black;
//Console.BackgroundColor = ConsoleColor.Black;
#endif
}

7
FFXIVClassic Map Server/packets/SubPacket.cs
View File

@ -140,7 +140,8 @@ namespace FFXIVClassic_Map_Server.packets
public void DebugPrintSubPacket()
{
#if DEBUG
Console.BackgroundColor = ConsoleColor.DarkRed;
// todo: create new target for colourful packet logging
//Console.BackgroundColor = ConsoleColor.DarkRed;
Program.Log.Debug("Size: 0x{0:X}{1}{2}", header.subpacketSize, Environment.NewLine, Utils.ByteArrayToHex(GetHeaderBytes()));
@ -148,12 +149,12 @@ namespace FFXIVClassic_Map_Server.packets
{
Program.Log.Debug("Opcode: 0x{0:X}{1}{2}", gameMessage.opcode, Environment.NewLine, Utils.ByteArrayToHex(GetGameMessageBytes(), SUBPACKET_SIZE));
Console.BackgroundColor = ConsoleColor.DarkMagenta;
//Console.BackgroundColor = ConsoleColor.DarkMagenta;
Program.Log.Debug("Data: {0}{1}", Environment.NewLine, Utils.ByteArrayToHex(data, SUBPACKET_SIZE + GAMEMESSAGE_SIZE));
}
Console.BackgroundColor = ConsoleColor.Black;
//Console.BackgroundColor = ConsoleColor.Black;
#endif
}