OpenCodeBox/fishbait
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dedicated Logger class

Browse source
This commit is contained in:
cxxpxr 2021-04-06 18:53:27 -04:00
parent e9cc15011b
commit 41166cb82d
3 changed files with 53 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Endpoint.cs
View file

@ -1,4 +1,5 @@
using Grapevine; using Grapevine;
using LightReflectiveMirror.Debug;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -44,15 +45,12 @@ namespace LightReflectiveMirror.LoadBalancing
string publicIP = req.Headers["PIP"]; string publicIP = req.Headers["PIP"];
string address = context.Request.RemoteEndPoint.Address.ToString(); string address = context.Request.RemoteEndPoint.Address.ToString();
Logger.WriteLogMessage("Received auth req [" + receivedAuthKey + "] == [" + Program.conf.AuthKey + "]");
if(Program.showDebugLogs)
Console.WriteLine("Received auth req [" + receivedAuthKey + "] == [" + Program.conf.AuthKey + "]");
// if server is authenticated // if server is authenticated
if (receivedAuthKey != null && address != null && endpointPort != null && gamePort != null && receivedAuthKey == Program.conf.AuthKey) if (receivedAuthKey != null && address != null && endpointPort != null && gamePort != null && receivedAuthKey == Program.conf.AuthKey)
{ {
if(Program.showDebugLogs) Logger.WriteLogMessage($"Server accepted: {address}:{gamePort}");
Console.WriteLine($"Server accepted: {address}:{gamePort}");
try try
{ {

37
LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Logger.cs Normal file
View file

@ -0,0 +1,37 @@
using System;
namespace LightReflectiveMirror.Debug
{
public static class Logger
{
private static LogConfiguration conf;
public static void ConfigureLogger(LogConfiguration config) => conf = config;
public static void WriteLogMessage(string message, ConsoleColor color = ConsoleColor.White, bool oneLine = false)
{
if(!conf.sendLogs) { return; }
Console.ForegroundColor = color;
if (oneLine)
Console.Write(message);
else
Console.WriteLine(message);
}
public static void ForceLogMessage(string message, ConsoleColor color = ConsoleColor.White, bool oneLine = false)
{
Console.ForegroundColor = color;
if (oneLine)
Console.Write(message);
else
Console.WriteLine(message);
}
public struct LogConfiguration
{
public bool sendLogs;
}
}
}

36
LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Program.cs
View file

@ -1,3 +1,4 @@
using LightReflectiveMirror.Debug;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -30,26 +31,29 @@ namespace LightReflectiveMirror.LoadBalancing
public async Task MainAsync() public async Task MainAsync()
{ {
WriteTitle(); WriteTitle();
instance = this; instance = this;
startupTime = DateTime.Now; startupTime = DateTime.Now;
if (!File.Exists(CONFIG_PATH)) if (!File.Exists(CONFIG_PATH))
{ {
File.WriteAllText(CONFIG_PATH, JsonConvert.SerializeObject(new Config(), Formatting.Indented)); File.WriteAllText(CONFIG_PATH, JsonConvert.SerializeObject(new Config(), Formatting.Indented));
WriteLogMessage("A config.json file was generated. Please configure it to the proper settings and re-run!", ConsoleColor.Yellow); Logger.ForceLogMessage("A config.json file was generated. Please configure it to the proper settings and re-run!", ConsoleColor.Yellow);
Console.ReadKey(); Console.ReadKey();
Environment.Exit(0); Environment.Exit(0);
} }
else else
{ {
conf = JsonConvert.DeserializeObject<Config>(File.ReadAllText(CONFIG_PATH)); conf = JsonConvert.DeserializeObject<Config>(File.ReadAllText(CONFIG_PATH));
Logger.ConfigureLogger(new Logger.LogConfiguration { sendLogs = conf.ShowDebugLogs });
_pingDelay = conf.ConnectedServerPingRate; _pingDelay = conf.ConnectedServerPingRate;
showDebugLogs = conf.ShowDebugLogs; showDebugLogs = conf.ShowDebugLogs;
if (new EndpointServer().Start(conf.EndpointPort)) if (new EndpointServer().Start(conf.EndpointPort))
WriteLogMessage("Endpoint server started successfully", ConsoleColor.Green); Logger.ForceLogMessage("Endpoint server started successfully", ConsoleColor.Green);
else else
WriteLogMessage("Endpoint server started unsuccessfully", ConsoleColor.Red); Logger.ForceLogMessage("Endpoint server started unsuccessfully", ConsoleColor.Red);
} }
var pingThread = new Thread(new ThreadStart(PingServers)); var pingThread = new Thread(new ThreadStart(PingServers));
@ -66,7 +70,7 @@ namespace LightReflectiveMirror.LoadBalancing
if (availableRelayServers.ContainsKey(relayAddr)) if (availableRelayServers.ContainsKey(relayAddr))
{ {
WriteLogMessage($"LRM Node {serverIP}:{port} tried to register while already registered!"); Logger.ForceLogMessage($"LRM Node {serverIP}:{port} tried to register while already registered!");
return; return;
} }
@ -115,8 +119,7 @@ namespace LightReflectiveMirror.LoadBalancing
{ {
while (true) while (true)
{ {
if (showDebugLogs) Logger.WriteLogMessage("Pinging " + availableRelayServers.Count + " available relays");
WriteLogMessage("Pinging " + availableRelayServers.Count + " available relays");
// Create a new list so we can modify the collection in our loop. // Create a new list so we can modify the collection in our loop.
var keys = new List<RelayAddress>(availableRelayServers.Keys); var keys = new List<RelayAddress>(availableRelayServers.Keys);
@ -132,8 +135,7 @@ namespace LightReflectiveMirror.LoadBalancing
var serverStats = wc.DownloadString(url); var serverStats = wc.DownloadString(url);
var deserializedData = JsonConvert.DeserializeObject<RelayServerInfo>(serverStats); var deserializedData = JsonConvert.DeserializeObject<RelayServerInfo>(serverStats);
if (showDebugLogs) Logger.ForceLogMessage("Server " + keys[i].Address + " still exists, keeping in collection.");
WriteLogMessage("Server " + keys[i].Address + " still exists, keeping in collection.");
if (availableRelayServers.ContainsKey(keys[i])) if (availableRelayServers.ContainsKey(keys[i]))
availableRelayServers[keys[i]] = deserializedData; availableRelayServers[keys[i]] = deserializedData;
@ -143,9 +145,7 @@ namespace LightReflectiveMirror.LoadBalancing
catch (Exception ex) catch (Exception ex)
{ {
// server doesnt exist anymore probably // server doesnt exist anymore probably
// do more shit here Logger.WriteLogMessage("Server " + keys[i] + " does not exist anymore, removing", ConsoleColor.Red);
if (showDebugLogs)
WriteLogMessage("Server " + keys[i] + " does not exist anymore, removing", ConsoleColor.Red);
availableRelayServers.Remove(keys[i]); availableRelayServers.Remove(keys[i]);
} }
} }
@ -182,19 +182,9 @@ namespace LightReflectiveMirror.LoadBalancing
"\nHarambe Memorial Initializing... OK" + "\nHarambe Memorial Initializing... OK" +
"\nBananas Initializing... OK\n"; "\nBananas Initializing... OK\n";
WriteLogMessage(t, ConsoleColor.Green); Logger.ForceLogMessage(t, ConsoleColor.Green);
WriteLogMessage(load, ConsoleColor.Cyan); Logger.ForceLogMessage(load, ConsoleColor.Cyan);
} }
static void WriteLogMessage(string message, ConsoleColor color = ConsoleColor.White, bool oneLine = false)
{
Console.ForegroundColor = color;
if (oneLine)
Console.Write(message);
else
Console.WriteLine(message);
}
} }
} }