modify iw6x parser to default game log vars temporarily, small amount of code cleanup to git rid of warnings

remove erroneous anticheat detection reason on kick

.gitignore

@@ -244,3 +244,4 @@ launchSettings.json
 /Tests/ApplicationTests/Files/GameEvents.json
 /Tests/ApplicationTests/Files/replay.json
 /GameLogServer/game_log_server_env
+.idea/*

Application/API/Master/IMasterApi.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using IW4MAdmin.Application.Misc;
 using Newtonsoft.Json;
 using RestEase;
 using SharedLibraryCore.Helpers;
@@ -35,6 +37,13 @@ namespace IW4MAdmin.Application.API.Master
         public string Message { get; set; }
     }
 
+    public class PluginSubscriptionContent
+    {
+        public string Content { get; set; }
+        public PluginType Type { get; set; }
+    }
+
+
     /// <summary>
     /// Defines the capabilities of the master API
     /// </summary>
@@ -63,5 +72,8 @@ namespace IW4MAdmin.Application.API.Master
 
         [Get("localization/{languageTag}")]
         Task<SharedLibraryCore.Localization.Layout> GetLocalization([Path("languageTag")] string languageTag);
+
+        [Get("plugin_subscriptions")]
+        Task<IEnumerable<PluginSubscriptionContent>> GetPluginSubscription([Query("instance_id")] Guid instanceId, [Query("subscription_id")] string subscription_id);
     }
 }

Application/Application.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.3.2.0</Version>
+    <Version>2020.0.0.0</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -59,6 +59,9 @@
     <None Update="DefaultSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Configuration\LoggingConfiguration.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

Application/ApplicationManager.cs

@@ -1,5 +1,4 @@
-using IW4MAdmin.Application.API.Master;
-using IW4MAdmin.Application.EventParsers;
+using IW4MAdmin.Application.EventParsers;
 using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Misc;
 using IW4MAdmin.Application.RconParsers;
@@ -9,11 +8,9 @@ using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Configuration.Validation;
 using SharedLibraryCore.Database;
 using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.QueryHelper;
 using SharedLibraryCore.Services;
 using System;
 using System.Collections;
@@ -24,7 +21,12 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
 using static SharedLibraryCore.GameEvent;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
 
 namespace IW4MAdmin.Application
 {
@@ -32,7 +34,7 @@ namespace IW4MAdmin.Application
     {
         private readonly ConcurrentBag<Server> _servers;
         public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
-        public ILogger Logger => GetLogger(0);
+        [Obsolete] public ObsoleteLogger Logger => _serviceProvider.GetRequiredService<ObsoleteLogger>();
         public bool IsRunning { get; private set; }
         public bool IsInitialized { get; private set; }
         public DateTime StartTime { get; private set; }
@@ -54,7 +56,6 @@ namespace IW4MAdmin.Application
         readonly PenaltyService PenaltySvc;
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         readonly IPageList PageList;
-        private readonly Dictionary<long, ILogger> _loggers = new Dictionary<long, ILogger>();
         private readonly IMetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
         private readonly CancellationTokenSource _tokenSource;
@@ -68,30 +69,33 @@ namespace IW4MAdmin.Application
         private readonly IScriptCommandFactory _scriptCommandFactory;
         private readonly IMetaRegistration _metaRegistration;
         private readonly IScriptPluginServiceResolver _scriptPluginServiceResolver;
+        private readonly IServiceProvider _serviceProvider;
+        private readonly ChangeHistoryService _changeHistoryService;
+        private readonly ApplicationConfiguration _appConfig;
 
-        public ApplicationManager(ILogger logger, IMiddlewareActionHandler actionHandler, IEnumerable<IManagerCommand> commands,
+        public ApplicationManager(ILogger<ApplicationManager> logger, IMiddlewareActionHandler actionHandler, IEnumerable<IManagerCommand> commands,
             ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
             IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
             IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
             IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
-            IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver)
+            IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
+            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig)
         {
             MiddlewareActionHandler = actionHandler;
             _servers = new ConcurrentBag<Server>();
             MessageTokens = new List<MessageToken>();
-            ClientSvc = new ClientService(contextFactory);
+            ClientSvc = clientService;
             AliasSvc = new AliasService();
             PenaltySvc = new PenaltyService();
             ConfigHandler = appConfigHandler;
             StartTime = DateTime.UtcNow;
             PageList = new PageList();
-            AdditionalEventParsers = new List<IEventParser>() { new BaseEventParser(parserRegexFactory, logger, appConfigHandler.Configuration()) };
-            AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(parserRegexFactory) };
+            AdditionalEventParsers = new List<IEventParser>() { new BaseEventParser(parserRegexFactory, logger, _appConfig) };
+            AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
             _metaService = metaService;
             _tokenSource = new CancellationTokenSource();
-            _loggers.Add(0, logger);
             _commands = commands.ToList();
             _translationLookup = translationLookup;
             _commandConfiguration = commandConfiguration;
@@ -102,6 +106,9 @@ namespace IW4MAdmin.Application
             _scriptCommandFactory = scriptCommandFactory;
             _metaRegistration = metaRegistration;
             _scriptPluginServiceResolver = scriptPluginServiceResolver;
+            _serviceProvider = serviceProvider;
+            _changeHistoryService = changeHistoryService;
+            _appConfig = appConfig;
             Plugins = plugins;
         }
 
@@ -109,10 +116,6 @@ namespace IW4MAdmin.Application
 
         public async Task ExecuteEvent(GameEvent newEvent)
         {
-#if DEBUG == true
-            Logger.WriteDebug($"Entering event process for {newEvent.Id}");
-#endif
-
             // the event has failed already
             if (newEvent.Failed)
             {
@@ -124,22 +127,17 @@ namespace IW4MAdmin.Application
                 await newEvent.Owner.ExecuteEvent(newEvent);
 
                 // save the event info to the database
-                var changeHistorySvc = new ChangeHistoryService();
-                await changeHistorySvc.Add(newEvent);
-
-#if DEBUG
-                Logger.WriteDebug($"Processed event with id {newEvent.Id}");
-#endif
+                await _changeHistoryService.Add(newEvent);
             }
 
             catch (TaskCanceledException)
             {
-                Logger.WriteInfo($"Received quit signal for event id {newEvent.Id}, so we are aborting early");
+                _logger.LogDebug("Received quit signal for event id {eventId}, so we are aborting early", newEvent.Id);
             }
 
             catch (OperationCanceledException)
             {
-                Logger.WriteInfo($"Received quit signal for event id {newEvent.Id}, so we are aborting early");
+                _logger.LogDebug("Received quit signal for event id {eventId}, so we are aborting early", newEvent.Id);
             }
 
             // this happens if a plugin requires login
@@ -152,31 +150,35 @@ namespace IW4MAdmin.Application
             catch (NetworkException ex)
             {
                 newEvent.FailReason = EventFailReason.Exception;
-                Logger.WriteError(ex.Message);
-                Logger.WriteDebug(ex.GetExceptionInfo());
+                using (LogContext.PushProperty("Server", newEvent.Owner?.ToString()))
+                {
+                    _logger.LogError(ex, ex.Message);
+                }
             }
 
             catch (ServerException ex)
             {
                 newEvent.FailReason = EventFailReason.Exception;
-                Logger.WriteWarning(ex.Message);
+                using (LogContext.PushProperty("Server", newEvent.Owner?.ToString()))
+                {
+                    _logger.LogError(ex, ex.Message);
+                }
             }
 
             catch (Exception ex)
             {
                 newEvent.FailReason = EventFailReason.Exception;
-                Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"].FormatExt(newEvent.Owner));
-                Logger.WriteDebug(ex.GetExceptionInfo());
+                Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"].FormatExt(newEvent.Owner));
+                using (LogContext.PushProperty("Server", newEvent.Owner?.ToString()))
+                {
+                    _logger.LogError(ex, "Unexpected exception");
+                }
             }
 
-        skip:
+            skip:
             // tell anyone waiting for the output that we're done
             newEvent.Complete();
             OnGameEventExecuted?.Invoke(this, newEvent);
-
-#if DEBUG == true
-            Logger.WriteDebug($"Exiting event process for {newEvent.Id}");
-#endif
         }
 
         public IList<Server> GetServers()
@@ -226,17 +228,14 @@ namespace IW4MAdmin.Application
                         try
                         {
                             await server.ProcessUpdatesAsync(_tokenSource.Token);
-
-                            if (server.Throttled)
-                            {
-                                await Task.Delay((int)_throttleTimeout.TotalMilliseconds, _tokenSource.Token);
-                            }
                         }
 
                         catch (Exception e)
                         {
-                            Logger.WriteWarning($"Failed to update status for {server}");
-                            Logger.WriteDebug(e.GetExceptionInfo());
+                            using (LogContext.PushProperty("Server", server.ToString()))
+                            {
+                                _logger.LogError(e, "Failed to update status");
+                            }
                         }
 
                         finally
@@ -245,12 +244,7 @@ namespace IW4MAdmin.Application
                         }
                     }));
                 }
-#if DEBUG
-                Logger.WriteDebug($"{runningUpdateTasks.Count} servers queued for stats updates");
-                ThreadPool.GetMaxThreads(out int workerThreads, out int n);
-                ThreadPool.GetAvailableThreads(out int availableThreads, out int m);
-                Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
-#endif
+
                 try
                 {
                     await Task.Delay(ConfigHandler.Configuration().RConPollRate, _tokenSource.Token);
@@ -289,8 +283,8 @@ namespace IW4MAdmin.Application
 
                             catch (Exception ex)
                             {
-                                Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_IMPORTER_ERROR"].FormatExt(scriptPlugin.Name));
-                                Logger.WriteDebug(ex.Message);
+                                Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_IMPORTER_ERROR"].FormatExt(scriptPlugin.Name));
+                                _logger.LogError(ex, "Could not properly load plugin {plugin}", scriptPlugin.Name);
                             }
                         };
                     }
@@ -303,32 +297,29 @@ namespace IW4MAdmin.Application
 
                 catch (Exception ex)
                 {
-                    Logger.WriteError($"{_translationLookup["SERVER_ERROR_PLUGIN"]} {plugin.Name}");
-                    Logger.WriteDebug(ex.GetExceptionInfo());
+                    _logger.LogError(ex, $"{_translationLookup["SERVER_ERROR_PLUGIN"]} {plugin.Name}");
                 }
             }
             #endregion
 
             #region CONFIG
-            var config = ConfigHandler.Configuration();
-
             // copy over default config if it doesn't exist
-            if (config == null)
+            if (!_appConfig.Servers?.Any() ?? true)
             {
                 var defaultConfig = new BaseConfigurationHandler<DefaultConfiguration>("DefaultSettings").Configuration();
-                ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
-                var newConfig = ConfigHandler.Configuration();
+                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
+                //var newConfig = ConfigHandler.Configuration();
 
-                newConfig.AutoMessages = defaultConfig.AutoMessages;
-                newConfig.GlobalRules = defaultConfig.GlobalRules;
-                newConfig.Maps = defaultConfig.Maps;
-                newConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
-                newConfig.QuickMessages = defaultConfig.QuickMessages;
+                _appConfig.AutoMessages = defaultConfig.AutoMessages;
+                _appConfig.GlobalRules = defaultConfig.GlobalRules;
+                _appConfig.Maps = defaultConfig.Maps;
+                _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
+                _appConfig.QuickMessages = defaultConfig.QuickMessages;
 
-                if (newConfig.Servers == null)
+                //if (newConfig.Servers == null)
                 {
-                    ConfigHandler.Set(newConfig);
-                    newConfig.Servers = new ServerConfiguration[1];
+                    ConfigHandler.Set(_appConfig);
+                    _appConfig.Servers = new ServerConfiguration[1];
 
                     do
                     {
@@ -343,30 +334,29 @@ namespace IW4MAdmin.Application
                             serverConfig.AddEventParser(parser);
                         }
 
-                        newConfig.Servers = newConfig.Servers.Where(_servers => _servers != null).Append((ServerConfiguration)serverConfig.Generate()).ToArray();
+                        _appConfig.Servers = _appConfig.Servers.Where(_servers => _servers != null).Append((ServerConfiguration)serverConfig.Generate()).ToArray();
                     } while (Utilities.PromptBool(_translationLookup["SETUP_SERVER_SAVE"]));
 
-                    config = newConfig;
                     await ConfigHandler.Save();
                 }
             }
 
             else
             {
-                if (string.IsNullOrEmpty(config.Id))
+                if (string.IsNullOrEmpty(_appConfig.Id))
                 {
-                    config.Id = Guid.NewGuid().ToString();
+                    _appConfig.Id = Guid.NewGuid().ToString();
                     await ConfigHandler.Save();
                 }
 
-                if (string.IsNullOrEmpty(config.WebfrontBindUrl))
+                if (string.IsNullOrEmpty(_appConfig.WebfrontBindUrl))
                 {
-                    config.WebfrontBindUrl = "http://0.0.0.0:1624";
+                    _appConfig.WebfrontBindUrl = "http://0.0.0.0:1624";
                     await ConfigHandler.Save();
                 }
 
                 var validator = new ApplicationConfigurationValidator();
-                var validationResult = validator.Validate(config);
+                var validationResult = validator.Validate(_appConfig);
 
                 if (!validationResult.IsValid)
                 {
@@ -377,7 +367,7 @@ namespace IW4MAdmin.Application
                     };
                 }
 
-                foreach (var serverConfig in config.Servers)
+                foreach (var serverConfig in _appConfig.Servers)
                 {
                     Migration.ConfigurationMigration.ModifyLogPath020919(serverConfig);
 
@@ -399,13 +389,13 @@ namespace IW4MAdmin.Application
                 }
             }
 
-            if (config.Servers.Length == 0)
+            if (_appConfig.Servers.Length == 0)
             {
                 throw new ServerException("A server configuration in IW4MAdminSettings.json is invalid");
             }
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-            Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(config.CustomParserEncoding) ? config.CustomParserEncoding : "windows-1252");
+            Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(_appConfig.CustomParserEncoding) ? _appConfig.CustomParserEncoding : "windows-1252");
 
             #endregion
 
@@ -440,8 +430,8 @@ namespace IW4MAdmin.Application
 
             // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
             // inject it to all the places that need it
-            cmdConfig.CommandPrefix = config.CommandPrefix;
-            cmdConfig.BroadcastCommandPrefix = config.BroadcastCommandPrefix;
+            cmdConfig.CommandPrefix = _appConfig.CommandPrefix;
+            cmdConfig.BroadcastCommandPrefix = _appConfig.BroadcastCommandPrefix;
 
             foreach (var cmd in commandsToAddToConfig)
             {
@@ -472,6 +462,7 @@ namespace IW4MAdmin.Application
             }
             #endregion
 
+            Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
         }
 
@@ -487,13 +478,17 @@ namespace IW4MAdmin.Application
                 {
                     // todo: this might not always be an IW4MServer
                     var ServerInstance = _serverInstanceFactory.CreateServer(Conf, this) as IW4MServer;
-                    await ServerInstance.Initialize();
+                    using (LogContext.PushProperty("Server", ServerInstance.ToString()))
+                    {
+                        _logger.LogInformation("Beginning server communication initialization");
+                        await ServerInstance.Initialize();
 
-                    _servers.Add(ServerInstance);
+                        _servers.Add(ServerInstance);
+                        Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
+                        _logger.LogInformation("Finishing initialization and now monitoring [{server}]", ServerInstance.Hostname, ServerInstance.ToString());
+                    }
 
-                    Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname));
                     // add the start event for this server
-
                     var e = new GameEvent()
                     {
                         Type = GameEvent.EventType.Start,
@@ -507,13 +502,11 @@ namespace IW4MAdmin.Application
 
                 catch (ServerException e)
                 {
-                    Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNFIXABLE"].FormatExt($"[{Conf.IPAddress}:{Conf.Port}]"));
-
-                    if (e.GetType() == typeof(DvarException))
+                    Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNFIXABLE"].FormatExt($"[{Conf.IPAddress}:{Conf.Port}]"));
+                    using (LogContext.PushProperty("Server", $"{Conf.IPAddress}:{Conf.Port}"))
                     {
-                        Logger.WriteDebug($"{e.Message} {(e.GetType() == typeof(DvarException) ? $"({Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR_HELP"]})" : "")}");
+                        _logger.LogError(e, "Unexpected exception occurred during initialization");
                     }
-
                     lastException = e;
                 }
             }
@@ -548,20 +541,10 @@ namespace IW4MAdmin.Application
             Stop();
         }
 
-        public ILogger GetLogger(long serverId)
+        [Obsolete]
+        public ObsoleteLogger GetLogger(long serverId)
         {
-            if (_loggers.ContainsKey(serverId))
-            {
-                return _loggers[serverId];
-            }
-
-            else
-            {
-                var newLogger = new Logger($"IW4MAdmin-Server-{serverId}");
-
-                _loggers.Add(serverId, newLogger);
-                return newLogger;
-            }
+            return _serviceProvider.GetRequiredService<ObsoleteLogger>();
         }
 
         public IList<MessageToken> GetMessageTokens()
@@ -607,7 +590,7 @@ namespace IW4MAdmin.Application
 
         public IRConParser GenerateDynamicRConParser(string name)
         {
-            return new DynamicRConParser(_parserRegexFactory)
+            return new DynamicRConParser(_serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), _parserRegexFactory)
             {
                 Name = name
             };

Application/BuildScripts/PostBuild.bat

@@ -4,24 +4,13 @@ set TargetDir=%3
 set OutDir=%4
 set Version=%5
 
-echo %Version% > "%SolutionDir%DEPLOY\version.txt"
-
 echo Copying dependency configs
 copy "%SolutionDir%WebfrontCore\%OutDir%*.deps.json" "%TargetDir%"
-copy "%SolutionDir%SharedLibaryCore\%OutDir%*.deps.json" "%TargetDir%"
+copy "%SolutionDir%SharedLibraryCore\%OutDir%*.deps.json" "%TargetDir%"
 
 if not exist "%TargetDir%Plugins" (
 	echo "Making plugin dir"
 	md "%TargetDir%Plugins"
 )
 
-xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
-
-echo Copying plugins for publish
-del %SolutionDir%BUILD\Plugins\Tests.dll
-xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\Windows\Plugins\"
-xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
-
-echo Copying script plugins for publish
-xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\Windows\Plugins\"
-xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
+xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"

Application/Configuration/LoggingConfiguration.json

@@ -0,0 +1,43 @@
+{
+  "Serilog": {
+    "Using": [
+      "Serilog.Sinks.File"
+    ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Log/IW4MAdmin-Application.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [
+      "FromLogContext",
+      "WithMachineName",
+      "WithThreadId"
+    ],
+    "Destructure": [
+      {
+        "Name": "ToMaximumDepth",
+        "Args": {
+          "maximumDestructuringDepth": 4
+        }
+      },
+      {
+        "Name": "ToMaximumStringLength",
+        "Args": {
+          "maximumStringLength": 1000
+        }
+      },
+      {
+        "Name": "ToMaximumCollectionCount",
+        "Args": {
+          "maximumCollectionCount": 24
+        }
+      }
+    ]
+  }
+}

Application/EventParsers/BaseEventParser.cs

@@ -5,7 +5,9 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Server;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -348,7 +350,7 @@ namespace IW4MAdmin.Application.EventParsers
 
                 catch (Exception e)
                 {
-                    _logger.WriteWarning($"Could not handle custom event generation - {e.GetExceptionInfo()}");
+                    _logger.LogError(e, $"Could not handle custom event generation");
                 }
             }
 

Application/EventParsers/DynamicEventParser.cs

@@ -1,5 +1,6 @@
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.EventParsers
 {

Application/Extensions/StartupExtensions.cs

@@ -0,0 +1,41 @@
+using System.IO;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+
+namespace IW4MAdmin.Application.Extensions
+{
+    public static class StartupExtensions
+    {
+        private static ILogger _defaultLogger = null;
+
+        public static IServiceCollection AddBaseLogger(this IServiceCollection services,
+            ApplicationConfiguration appConfig)
+        {
+            if (_defaultLogger == null)
+            {
+                var configuration = new ConfigurationBuilder()
+                    .AddJsonFile(Path.Join(Utilities.OperatingDirectory, "Configuration", "LoggingConfiguration.json"))
+                    .Build();
+
+                var loggerConfig = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration);
+
+
+                if (Utilities.IsDevelopment)
+                {
+                    loggerConfig = loggerConfig.WriteTo.Console(
+                        outputTemplate:"[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}")
+                        .MinimumLevel.Debug();
+                }
+
+                _defaultLogger = loggerConfig.CreateLogger();
+            }
+
+            services.AddLogging(builder => builder.AddSerilog(_defaultLogger, dispose: true));
+            return services;
+        }
+    }
+}

Application/Factories/GameLogReaderFactory.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using SharedLibraryCore.Interfaces;
 using System;
+using Microsoft.Extensions.Logging;
 
 namespace IW4MAdmin.Application.Factories
 {
@@ -19,12 +20,12 @@ namespace IW4MAdmin.Application.Factories
             var baseUri = logUris[0];
             if (baseUri.Scheme == Uri.UriSchemeHttp)
             {
-                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger>());
+                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
             }
 
             else if (baseUri.Scheme == Uri.UriSchemeFile)
             {
-                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger>());
+                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
             }
 
             throw new NotImplementedException($"No log reader implemented for Uri scheme \"{baseUri.Scheme}\"");

Application/Factories/GameServerInstanceFactory.cs

@@ -1,7 +1,7 @@
-using SharedLibraryCore;
+using System;
+using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
-using System.Collections;
 
 namespace IW4MAdmin.Application.Factories
 {
@@ -11,21 +11,21 @@ namespace IW4MAdmin.Application.Factories
     internal class GameServerInstanceFactory : IGameServerInstanceFactory
     {
         private readonly ITranslationLookup _translationLookup;
-        private readonly IRConConnectionFactory _rconConnectionFactory;
-        private readonly IGameLogReaderFactory _gameLogReaderFactory;
         private readonly IMetaService _metaService;
+        private readonly IServiceProvider _serviceProvider;
 
         /// <summary>
         /// base constructor
         /// </summary>
         /// <param name="translationLookup"></param>
         /// <param name="rconConnectionFactory"></param>
-        public GameServerInstanceFactory(ITranslationLookup translationLookup, IRConConnectionFactory rconConnectionFactory, IGameLogReaderFactory gameLogReaderFactory, IMetaService metaService)
+        public GameServerInstanceFactory(ITranslationLookup translationLookup, 
+            IMetaService metaService,
+            IServiceProvider serviceProvider)
         {
             _translationLookup = translationLookup;
-            _rconConnectionFactory = rconConnectionFactory;
-            _gameLogReaderFactory = gameLogReaderFactory;
             _metaService = metaService;
+            _serviceProvider = serviceProvider;
         }
 
         /// <summary>
@@ -36,7 +36,7 @@ namespace IW4MAdmin.Application.Factories
         /// <returns></returns>
         public Server CreateServer(ServerConfiguration config, IManager manager)
         {
-            return new IW4MServer(manager, config, _translationLookup, _rconConnectionFactory, _gameLogReaderFactory, _metaService);
+            return new IW4MServer(config, _translationLookup, _metaService, _serviceProvider);
         }
     }
 }

Application/Factories/RConConnectionFactory.cs

@@ -1,6 +1,7 @@
 using IW4MAdmin.Application.RCon;
 using SharedLibraryCore.Interfaces;
 using System.Text;
+using Microsoft.Extensions.Logging;
 
 namespace IW4MAdmin.Application.Factories
 {
@@ -10,13 +11,13 @@ namespace IW4MAdmin.Application.Factories
     internal class RConConnectionFactory : IRConConnectionFactory
     {
         private static readonly Encoding gameEncoding = Encoding.GetEncoding("windows-1252");
-        private readonly ILogger _logger;
+        private readonly ILogger<RConConnection> _logger;
        
         /// <summary>
         /// Base constructor
         /// </summary>
         /// <param name="logger"></param>
-        public RConConnectionFactory(ILogger logger)
+        public RConConnectionFactory(ILogger<RConConnection> logger)
         {
             _logger = logger;
         }

Application/Factories/ScriptCommandFactory.cs

@@ -6,6 +6,8 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Database.Models.EFClient;
 
 namespace IW4MAdmin.Application.Factories
@@ -15,17 +17,20 @@ namespace IW4MAdmin.Application.Factories
     /// </summary>
     public class ScriptCommandFactory : IScriptCommandFactory
     {
-        private CommandConfiguration _config;
+        private readonly CommandConfiguration _config;
         private readonly ITranslationLookup _transLookup;
+        private readonly IServiceProvider _serviceProvider;
 
-        public ScriptCommandFactory(CommandConfiguration  config, ITranslationLookup transLookup)
+        public ScriptCommandFactory(CommandConfiguration  config, ITranslationLookup transLookup, IServiceProvider serviceProvider)
         {
             _config = config;
             _transLookup = transLookup;
+            _serviceProvider = serviceProvider;
         }
 
         /// <inheritdoc/>
-        public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, bool isTargetRequired, IEnumerable<(string, bool)> args, Action<GameEvent> executeAction)
+        public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, 
+            bool isTargetRequired, IEnumerable<(string, bool)> args, Action<GameEvent> executeAction)
         {
             var permissionEnum = Enum.Parse<Permission>(permission);
             var argsArray = args.Select(_arg => new CommandArgument
@@ -34,7 +39,8 @@ namespace IW4MAdmin.Application.Factories
                 Required = _arg.Item2
             }).ToArray();
 
-            return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, argsArray, executeAction, _config, _transLookup);
+            return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, argsArray, executeAction,
+                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>());
         }
     }
 }

Application/GameEventHandler.cs

@@ -1,19 +1,18 @@
 using IW4MAdmin.Application.Misc;
-using Newtonsoft.Json;
 using SharedLibraryCore;
 using SharedLibraryCore.Events;
 using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application
 {
     public class GameEventHandler : IEventHandler
     {
         private readonly EventLog _eventLog;
+        private readonly ILogger _logger;
         private static readonly GameEvent.EventType[] overrideEvents = new[]
         {
             GameEvent.EventType.Connect,
@@ -22,34 +21,23 @@ namespace IW4MAdmin.Application
             GameEvent.EventType.Stop
         };
 
-        public GameEventHandler()
+        public GameEventHandler(ILogger<GameEventHandler> logger)
         {
             _eventLog = new EventLog();
+            _logger = logger;
         }
 
         public void HandleEvent(IManager manager, GameEvent gameEvent)
         {
-#if DEBUG
-            ThreadPool.GetMaxThreads(out int workerThreads, out int n);
-            ThreadPool.GetAvailableThreads(out int availableThreads, out int m);
-            gameEvent.Owner.Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
-
-#endif
             if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
             {
-#if DEBUG
-                gameEvent.Owner.Logger.WriteDebug($"Adding event with id {gameEvent.Id}");
-#endif
-
                 EventApi.OnGameEvent(gameEvent);
                 Task.Factory.StartNew(() => manager.ExecuteEvent(gameEvent));
             }
-#if DEBUG
             else
             {
-                gameEvent.Owner.Logger.WriteDebug($"Skipping event as we're shutting down {gameEvent.Id}");
+                _logger.LogDebug("Skipping event as we're shutting down {eventId}", gameEvent.Id);
             }
-#endif
         }
     }
 }

Application/IO/GameLogEventDetection.cs

@@ -3,6 +3,9 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.IO
 {
@@ -12,12 +15,14 @@ namespace IW4MAdmin.Application.IO
         private readonly Server _server;
         private readonly IGameLogReader _reader;
         private readonly bool _ignoreBots;
+        private readonly ILogger _logger;
 
-        public GameLogEventDetection(Server server, Uri[] gameLogUris, IGameLogReaderFactory gameLogReaderFactory)
+        public GameLogEventDetection(ILogger<GameLogEventDetection> logger, IW4MServer server, Uri[] gameLogUris, IGameLogReaderFactory gameLogReaderFactory)
         {
             _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
             _server = server;
             _ignoreBots = server?.Manager.GetApplicationSettings().Configuration().IgnoreBots ?? false;
+            _logger = logger;
         }
 
         public async Task PollForChanges()
@@ -33,15 +38,17 @@ namespace IW4MAdmin.Application.IO
 
                     catch (Exception e)
                     {
-                        _server.Logger.WriteWarning($"Failed to update log event for {_server.EndPoint}");
-                        _server.Logger.WriteDebug(e.GetExceptionInfo());
+                        using(LogContext.PushProperty("Server", _server.ToString()))
+                        {
+                            _logger.LogError(e, "Failed to update log event for {endpoint}", _server.EndPoint);
+                        }
                     }
                 }
 
                 await Task.Delay(_reader.UpdateInterval, _server.Manager.CancellationToken);
             }
 
-            _server.Logger.WriteDebug("Stopped polling for changes");
+            _logger.LogDebug("Stopped polling for changes");
         }
 
         public async Task UpdateLogEvents()
@@ -68,9 +75,6 @@ namespace IW4MAdmin.Application.IO
             {
                 try
                 {
-#if DEBUG
-                    _server.Logger.WriteVerbose(gameEvent.Data);
-#endif
                     gameEvent.Owner = _server;
 
                     // we don't want to add the event if ignoreBots is on and the event comes from a bot
@@ -102,10 +106,14 @@ namespace IW4MAdmin.Application.IO
 
                 catch (InvalidOperationException)
                 {
-                    if (!_ignoreBots)
+                    if (_ignoreBots)
                     {
-                        _server.Logger.WriteWarning("Could not find client in client list when parsing event line");
-                        _server.Logger.WriteDebug(gameEvent.Data);
+                        continue;
+                    }
+                    
+                    using(LogContext.PushProperty("Server", _server.ToString()))
+                    {
+                        _logger.LogError("Could not find client in client list when parsing event line {data}", gameEvent.Data);
                     }
                 }
             }

Application/IO/GameLogReader.cs

@@ -6,6 +6,8 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.IO
 {
@@ -19,7 +21,7 @@ namespace IW4MAdmin.Application.IO
 
         public int UpdateInterval => 300;
 
-        public GameLogReader(string logFile, IEventParser parser, ILogger logger)
+        public GameLogReader(string logFile, IEventParser parser, ILogger<GameLogReader> logger)
         {
             _logFile = logFile;
             _parser = parser;
@@ -73,9 +75,7 @@ namespace IW4MAdmin.Application.IO
 
                 catch (Exception e)
                 {
-                    _logger.WriteWarning("Could not properly parse event line");
-                    _logger.WriteDebug(e.Message);
-                    _logger.WriteDebug(eventLine);
+                    _logger.LogError(e, "Could not properly parse event line {@eventLine}", eventLine);
                 }
             }
 

Application/IO/GameLogReaderHttp.cs

@@ -6,6 +6,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.IO
 {
@@ -20,7 +22,7 @@ namespace IW4MAdmin.Application.IO
         private readonly string _safeLogPath;
         private string lastKey = "next";
 
-        public GameLogReaderHttp(Uri[] gameLogServerUris, IEventParser parser, ILogger logger)
+        public GameLogReaderHttp(Uri[] gameLogServerUris, IEventParser parser, ILogger<GameLogReaderHttp> logger)
         {
             _eventParser = parser;
             _logServerApi = RestClient.For<IGameLogServer>(gameLogServerUris[0].ToString());
@@ -40,7 +42,7 @@ namespace IW4MAdmin.Application.IO
 
             if (!response.Success && string.IsNullOrEmpty(lastKey))
             {
-                _logger.WriteError($"Could not get log server info of {_safeLogPath}");
+                _logger.LogError("Could not get log server info of {logPath}", _safeLogPath);
                 return events;
             }
 
@@ -62,9 +64,7 @@ namespace IW4MAdmin.Application.IO
 
                     catch (Exception e)
                     {
-                        _logger.WriteError("Could not properly parse event line from http");
-                        _logger.WriteDebug(e.Message);
-                        _logger.WriteDebug(eventLine);
+                        _logger.LogError(e, "Could not properly parse event line from http {eventLine}", eventLine);
                     }
                 }
             }

Application/Localization/Configure.cs

@@ -6,15 +6,22 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Configuration;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Localization
 {
-    public class Configure
+    public static class Configure
     {
-        public static ITranslationLookup Initialize(bool useLocalTranslation, IMasterApi apiInstance, string customLocale = null)
+        public static ITranslationLookup Initialize(ILogger logger, IMasterApi apiInstance, ApplicationConfiguration applicationConfiguration)
         {
-            string currentLocale = string.IsNullOrEmpty(customLocale) ? CultureInfo.CurrentCulture.Name : customLocale;
-            string[] localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale}.json");
+            var useLocalTranslation = applicationConfiguration?.UseLocalTranslations ?? true;
+            var customLocale = applicationConfiguration?.EnableCustomLocale ?? false
+                ? (applicationConfiguration.CustomLocale ?? "en-US")
+                : "en-US";
+            var currentLocale = string.IsNullOrEmpty(customLocale) ? CultureInfo.CurrentCulture.Name : customLocale;
+            var localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale}.json");
 
             if (!useLocalTranslation)
             {
@@ -25,9 +32,10 @@ namespace IW4MAdmin.Application.Localization
                     return localization.LocalizationIndex;
                 }
 
-                catch (Exception)
+                catch (Exception ex)
                 {
                     // the online localization failed so will default to local files
+                    logger.LogWarning(ex, "Could not download latest translations");
                 }
             }
 
@@ -60,13 +68,11 @@ namespace IW4MAdmin.Application.Localization
                 {
                     if (!localizationDict.TryAdd(item.Key, item.Value))
                     {
-                        Program.ServerManager.GetLogger(0).WriteError($"Could not add locale string {item.Key} to localization");
+                        logger.LogError("Could not add locale string {key} to localization", item.Key);
                     }
                 }
             }
 
-            string localizationFile = $"{Path.Join(Utilities.OperatingDirectory, "Localization")}{Path.DirectorySeparatorChar}IW4MAdmin.{currentLocale}-{currentLocale.ToUpper()}.json";
-
             Utilities.CurrentLocalization = new SharedLibraryCore.Localization.Layout(localizationDict)
             {
                 LocalizationName = currentLocale,

Application/Main.cs

@@ -1,7 +1,6 @@
 using IW4MAdmin.Application.API.Master;
 using IW4MAdmin.Application.EventParsers;
 using IW4MAdmin.Application.Factories;
-using IW4MAdmin.Application.Helpers;
 using IW4MAdmin.Application.Meta;
 using IW4MAdmin.Application.Migration;
 using IW4MAdmin.Application.Misc;
@@ -24,6 +23,10 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using IW4MAdmin.Application.Extensions;
+using IW4MAdmin.Application.Localization;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application
 {
@@ -76,29 +79,32 @@ namespace IW4MAdmin.Application
         {
         restart:
             ITranslationLookup translationLookup = null;
+            var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
+            Utilities.DefaultLogger = logger;
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
+            
             try
             {
                 // do any needed housekeeping file/folder migrations
                 ConfigurationMigration.MoveConfigFolder10518(null);
                 ConfigurationMigration.CheckDirectories();
-
+                logger.LogDebug("Configuring services...");
                 var services = ConfigureServices(args);
                 serviceProvider = services.BuildServiceProvider();
                 var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
                 ServerManager = (ApplicationManager)serviceProvider.GetRequiredService<IManager>();
                 translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                ServerManager.Logger.WriteInfo(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_VERSION"].FormatExt(Version));
-
                 await versionChecker.CheckVersion();
                 await ServerManager.Init();
             }
 
             catch (Exception e)
             {
-                string failMessage = translationLookup == null ? "Failed to initalize IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
+                string failMessage = translationLookup == null ? "Failed to initialize IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
                 string exitMessage = translationLookup == null ? "Press enter to exit..." : translationLookup["MANAGER_EXIT"];
 
+                logger.LogCritical(e, "Failed to initialize IW4MAdmin");
                 Console.WriteLine(failMessage);
 
                 while (e.InnerException != null)
@@ -131,13 +137,14 @@ namespace IW4MAdmin.Application
 
             try
             {
-                ApplicationTask = RunApplicationTasksAsync();
+                ApplicationTask = RunApplicationTasksAsync(logger);
                 await ApplicationTask;
             }
 
-            catch (Exception e) 
+            catch (Exception e)
             {
-                string failMessage = translationLookup == null ? "Failed to initalize IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
+                logger.LogCritical(e, "Failed to launch IW4MAdmin");
+                string failMessage = translationLookup == null ? "Failed to launch IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
                 Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
             }
 
@@ -153,7 +160,7 @@ namespace IW4MAdmin.Application
         /// runs the core application tasks
         /// </summary>
         /// <returns></returns>
-        private static async Task RunApplicationTasksAsync()
+        private static async Task RunApplicationTasksAsync(ILogger logger)
         {
             var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront ?
                 WebfrontCore.Program.Init(ServerManager, serviceProvider, ServerManager.CancellationToken) :
@@ -161,7 +168,7 @@ namespace IW4MAdmin.Application
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            var inputThread = new Thread(async () => await ReadConsoleInput());
+            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
             inputThread.Start();
 
             var tasks = new[]
@@ -171,9 +178,11 @@ namespace IW4MAdmin.Application
                 serviceProvider.GetRequiredService<IMasterCommunication>().RunUploadStatus(ServerManager.CancellationToken)
             };
 
+            logger.LogDebug("Starting webfront and input tasks");
             await Task.WhenAll(tasks);
 
-            ServerManager.Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
+            logger.LogInformation("Shutdown completed successfully");
+            Console.Write(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
 
 
@@ -181,11 +190,11 @@ namespace IW4MAdmin.Application
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
         /// <returns></returns>
-        private static async Task ReadConsoleInput()
+        private static async Task ReadConsoleInput(ILogger logger)
         {
             if (Console.IsInputRedirected)
             {
-                ServerManager.Logger.WriteInfo("Disabling console input as it has been redirected");
+                logger.LogInformation("Disabling console input as it has been redirected");
                 return;
             }
 
@@ -221,68 +230,29 @@ namespace IW4MAdmin.Application
             { }
         }
 
-        /// <summary>
-        /// Configures the dependency injection services
-        /// </summary>
-        private static IServiceCollection ConfigureServices(string[] args)
+        private static IServiceCollection HandlePluginRegistration(ApplicationConfiguration appConfig, 
+            IServiceCollection serviceCollection, 
+            IMasterApi masterApi)
         {
-            var defaultLogger = new Logger("IW4MAdmin-Manager");
-            var pluginImporter = new PluginImporter(defaultLogger);
-
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
-                .AddSingleton(new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings") as IConfigurationHandler<ApplicationConfiguration>)
-                .AddSingleton(new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as IConfigurationHandler<CommandConfiguration>)
-                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration() ?? new ApplicationConfiguration())
-                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>().Configuration() ?? new CommandConfiguration())
-                .AddSingleton<ILogger>(_serviceProvider => defaultLogger)
+            var defaultLogger = BuildDefaultLogger<Program>(appConfig);
+            var pluginServiceProvider = new ServiceCollection()
+                .AddBaseLogger(appConfig)
+                .AddSingleton(appConfig)
+                .AddSingleton(masterApi)
+                .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IPluginImporter, PluginImporter>()
-                .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
-                .AddSingleton<IRConConnectionFactory, RConConnectionFactory>()
-                .AddSingleton<IGameServerInstanceFactory, GameServerInstanceFactory>()
-                .AddSingleton<IConfigurationHandlerFactory, ConfigurationHandlerFactory>()
-                .AddSingleton<IParserRegexFactory, ParserRegexFactory>()
-                .AddSingleton<IDatabaseContextFactory, DatabaseContextFactory>()
-                .AddSingleton<IGameLogReaderFactory, GameLogReaderFactory>()
-                .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
-                .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
-                .AddSingleton<IEntityService<EFClient>, ClientService>()
-                .AddSingleton<IMetaService, MetaService>()
-                .AddSingleton<IMetaRegistration, MetaRegistration>()
-                .AddSingleton<IScriptPluginServiceResolver, ScriptPluginServiceResolver>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>, ReceivedPenaltyResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>, AdministeredPenaltyResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>, UpdatedAliasResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
-                .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
-                .AddSingleton(_serviceProvider =>
-                {
-                    var config = _serviceProvider.GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration();
-                    return Localization.Configure.Initialize(useLocalTranslation: config?.UseLocalTranslations ?? false,
-                        apiInstance: _serviceProvider.GetRequiredService<IMasterApi>(),
-                        customLocale: config?.EnableCustomLocale ?? false ? (config.CustomLocale ?? "en-US") : "en-US");
-                })
-                .AddSingleton<IManager, ApplicationManager>()
-                .AddSingleton(_serviceProvider => RestClient
-                    .For<IMasterApi>(Utilities.IsDevelopment ? new Uri("http://127.0.0.1:8080") : _serviceProvider
-                    .GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration()?.MasterUrl ??
-                    new ApplicationConfiguration().MasterUrl))
-                .AddSingleton<IMasterCommunication, MasterCommunication>();
-
-            if (args.Contains("serialevents"))
-            {
-                serviceCollection.AddSingleton<IEventHandler, SerialGameEventHandler>();
-            }
-            else
-            {
-                serviceCollection.AddSingleton<IEventHandler, GameEventHandler>();
-            }
+                .BuildServiceProvider();
 
+            var pluginImporter = pluginServiceProvider.GetRequiredService<IPluginImporter>();
+            
+            // we need to register the rest client with regular collection
+            serviceCollection.AddSingleton(masterApi);
+            
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
                         .Where(_command => _command.BaseType == typeof(Command)))
             {
-                defaultLogger.WriteInfo($"Registered native command type {commandType.Name}");
+                defaultLogger.LogDebug("Registered native command type {name}", commandType.Name);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -290,14 +260,14 @@ namespace IW4MAdmin.Application
             var pluginImplementations = pluginImporter.DiscoverAssemblyPluginImplementations();
             foreach (var pluginType in pluginImplementations.Item1)
             {
-                defaultLogger.WriteInfo($"Registered plugin type {pluginType.FullName}");
+                defaultLogger.LogDebug("Registered plugin type {name}", pluginType.FullName);
                 serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
             }
 
             // register the plugin commands
             foreach (var commandType in pluginImplementations.Item2)
             {
-                defaultLogger.WriteInfo($"Registered plugin command type {commandType.FullName}");
+                defaultLogger.LogDebug("Registered plugin command type {name}", commandType.FullName);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -321,5 +291,86 @@ namespace IW4MAdmin.Application
 
             return serviceCollection;
         }
+        
+
+        /// <summary>
+        /// Configures the dependency injection services
+        /// </summary>
+        private static IServiceCollection ConfigureServices(string[] args)
+        {
+            // setup the static resources (config/master api/translations)
+            var serviceCollection = new ServiceCollection();
+            var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
+            var appConfig = appConfigHandler.Configuration();
+            var masterUri = Utilities.IsDevelopment
+                ? new Uri("http://127.0.0.1:8080")
+                : appConfig?.MasterUrl ?? new ApplicationConfiguration().MasterUrl;
+            var masterRestClient = RestClient.For<IMasterApi>(masterUri);
+            var translationLookup =  Configure.Initialize(Utilities.DefaultLogger, masterRestClient, appConfig);
+
+            if (appConfig == null)
+            {
+                appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
+                appConfigHandler.Set(appConfig);
+                appConfigHandler.Save();
+            }
+            
+            // build the dependency list
+            HandlePluginRegistration(appConfig, serviceCollection, masterRestClient);
+
+            serviceCollection
+                .AddBaseLogger(appConfig)
+                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
+                .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
+                .AddSingleton(new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as IConfigurationHandler<CommandConfiguration>)
+                .AddSingleton(appConfig)
+                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>().Configuration() ?? new CommandConfiguration())
+                .AddSingleton<IPluginImporter, PluginImporter>()
+                .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
+                .AddSingleton<IRConConnectionFactory, RConConnectionFactory>()
+                .AddSingleton<IGameServerInstanceFactory, GameServerInstanceFactory>()
+                .AddSingleton<IConfigurationHandlerFactory, ConfigurationHandlerFactory>()
+                .AddSingleton<IParserRegexFactory, ParserRegexFactory>()
+                .AddSingleton<IDatabaseContextFactory, DatabaseContextFactory>()
+                .AddSingleton<IGameLogReaderFactory, GameLogReaderFactory>()
+                .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
+                .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
+                .AddSingleton<IEntityService<EFClient>, ClientService>()
+                .AddSingleton<IMetaService, MetaService>()
+                .AddSingleton<ClientService>()
+                .AddSingleton<ChangeHistoryService>()
+                .AddSingleton<IMetaRegistration, MetaRegistration>()
+                .AddSingleton<IScriptPluginServiceResolver, ScriptPluginServiceResolver>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>, ReceivedPenaltyResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>, AdministeredPenaltyResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>, UpdatedAliasResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
+                .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
+                .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
+                .AddSingleton<IMasterCommunication, MasterCommunication>()
+                .AddSingleton<IManager, ApplicationManager>()
+                .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
+                .AddSingleton(translationLookup);
+
+            if (args.Contains("serialevents"))
+            {
+                serviceCollection.AddSingleton<IEventHandler, SerialGameEventHandler>();
+            }
+            else
+            {
+                serviceCollection.AddSingleton<IEventHandler, GameEventHandler>();
+            }
+
+            return serviceCollection;
+        }
+       
+        private static ILogger BuildDefaultLogger<T>(ApplicationConfiguration appConfig)
+        {
+            var collection = new ServiceCollection()
+                .AddBaseLogger(appConfig)
+                .BuildServiceProvider();
+
+            return collection.GetRequiredService<ILogger<T>>();
+        }
     }
 }

Application/Meta/AdministeredPenaltyResourceQueryHelper.cs

@@ -1,11 +1,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
 {
@@ -18,7 +20,7 @@ namespace IW4MAdmin.Application.Meta
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
 
-        public AdministeredPenaltyResourceQueryHelper(ILogger logger, IDatabaseContextFactory contextFactory)
+        public AdministeredPenaltyResourceQueryHelper(ILogger<AdministeredPenaltyResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
         {
             _contextFactory = contextFactory;
             _logger = logger;

Application/Meta/MetaRegistration.cs

@@ -6,6 +6,8 @@ using SharedLibraryCore.QueryHelper;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
 {
@@ -19,7 +21,7 @@ namespace IW4MAdmin.Application.Meta
         private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
 
-        public MetaRegistration(ILogger logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
+        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
             IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper)
@@ -82,7 +84,7 @@ namespace IW4MAdmin.Application.Meta
 
             if (client == null)
             {
-                _logger.WriteWarning($"No client found with id {request.ClientId} when generating profile meta");
+                _logger.LogWarning("No client found with id {clientId} when generating profile meta", request.ClientId);
                 return metaList;
             }
 

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -2,12 +2,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
 {
@@ -20,7 +22,7 @@ namespace IW4MAdmin.Application.Meta
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
 
-        public ReceivedPenaltyResourceQueryHelper(ILogger logger, IDatabaseContextFactory contextFactory)
+        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
         {
             _contextFactory = contextFactory;
             _logger = logger;

Application/Meta/UpdatedAliasResourceQueryHelper.cs

@@ -6,6 +6,8 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
 {
@@ -18,7 +20,7 @@ namespace IW4MAdmin.Application.Meta
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
 
-        public UpdatedAliasResourceQueryHelper(ILogger logger, IDatabaseContextFactory contextFactory)
+        public UpdatedAliasResourceQueryHelper(ILogger<UpdatedAliasResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
         {
             _logger = logger;
             _contextFactory = contextFactory;

Application/Migration/ConfigurationMigration.cs

@@ -1,11 +1,8 @@
 using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Migration
 {
@@ -56,7 +53,6 @@ namespace IW4MAdmin.Application.Migration
 
                 if (!Directory.Exists(configDirectory))
                 {
-                    log?.WriteDebug($"Creating directory for configs {configDirectory}");
                     Directory.CreateDirectory(configDirectory);
                 }
 
@@ -66,7 +62,6 @@ namespace IW4MAdmin.Application.Migration
 
                 foreach (var configFile in configurationFiles)
                 {
-                    log?.WriteDebug($"Moving config file {configFile}");
                     string destinationPath = Path.Join("Configuration", configFile);
                     if (!File.Exists(destinationPath))
                     {
@@ -77,7 +72,6 @@ namespace IW4MAdmin.Application.Migration
                 if (!File.Exists(Path.Join("Database", "Database.db")) &&
                     File.Exists("Database.db"))
                 {
-                    log?.WriteDebug("Moving database file");
                     File.Move("Database.db", Path.Join("Database", "Database.db"));
                 }
             }

Application/Misc/EventProfiler.cs

@@ -1,63 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace IW4MAdmin.Application.Misc
-{
-    internal class EventPerformance
-    {
-        public long ExecutionTime { get; set; }
-        public GameEvent Event { get; set; }
-        public string EventInfo => $"{Event.Type}, {Event.FailReason}, {Event.IsBlocking}, {Event.Data}, {Event.Message}, {Event.Extra}";
-    }
-
-    public class DuplicateKeyComparer<TKey> : IComparer<TKey> where TKey : IComparable
-    {
-        public int Compare(TKey x, TKey y)
-        {
-            int result = x.CompareTo(y);
-
-            if (result == 0)
-                return 1;
-            else
-                return result;
-        }
-    }
-
-    internal class EventProfiler
-    {
-        public double AverageEventTime { get; private set; }
-        public double MaxEventTime => Events.Values.Last().ExecutionTime;
-        public double MinEventTime => Events.Values[0].ExecutionTime;
-        public int TotalEventCount => Events.Count;
-        public SortedList<long, EventPerformance> Events { get; private set; } = new SortedList<long, EventPerformance>(new DuplicateKeyComparer<long>());
-        private readonly ILogger _logger;
-
-        public EventProfiler(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public void Profile(DateTime start, DateTime end, GameEvent gameEvent)
-        {
-            _logger.WriteDebug($"Starting profile of event {gameEvent.Id}");
-            long executionTime = (long)Math.Round((end - start).TotalMilliseconds);
-
-            var perf = new EventPerformance()
-            {
-                Event = gameEvent,
-                ExecutionTime = executionTime
-            };
-
-            lock (Events)
-            {
-                Events.Add(executionTime, perf);
-            }
-
-            AverageEventTime = (AverageEventTime * (TotalEventCount - 1) + executionTime) / TotalEventCount;
-            _logger.WriteDebug($"Finished profile of event {gameEvent.Id}");
-        }
-    }
-}

Application/Misc/Logger.cs

@@ -1,132 +1,47 @@
-using IW4MAdmin.Application.IO;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
+using System;
+using Microsoft.Extensions.Logging;
+using ILogger = SharedLibraryCore.Interfaces.ILogger;
 
 namespace IW4MAdmin.Application
 {
+    [Obsolete]
     public class Logger : ILogger
     {
-        enum LogType
+        private readonly Microsoft.Extensions.Logging.ILogger _logger;
+
+        public Logger(ILogger<Logger> logger)
         {
-            Verbose,
-            Info,
-            Debug,
-            Warning,
-            Error,
-            Assert
-        }
-
-        readonly string FileName;
-        readonly ReaderWriterLockSlim WritingLock;
-        static readonly short MAX_LOG_FILES = 10;
-
-        public Logger(string fn)
-        {
-            FileName = Path.Join(Utilities.OperatingDirectory, "Log", $"{fn}.log");
-            WritingLock = new ReaderWriterLockSlim();
-            RotateLogs();
-        }
-
-        ~Logger()
-        {
-            WritingLock.Dispose();
-        }
-
-        /// <summary>
-        /// rotates logs when log is initialized
-        /// </summary>
-        private void RotateLogs()
-        {
-            string maxLog = FileName + MAX_LOG_FILES;
-
-            if (File.Exists(maxLog))
-            {
-                File.Delete(maxLog);
-            }
-
-            for (int i = MAX_LOG_FILES - 1; i >= 0; i--)
-            {
-                string logToMove = i == 0 ? FileName : FileName + i;
-                string movedLogName = FileName + (i + 1);
-
-                if (File.Exists(logToMove))
-                {
-                    File.Move(logToMove, movedLogName);
-                }
-            }
-        }
-
-        void Write(string msg, LogType type)
-        {
-            WritingLock.EnterWriteLock();
-
-            string stringType = type.ToString();
-            msg = msg.StripColors();
-
-            try
-            {
-                stringType = Utilities.CurrentLocalization.LocalizationIndex[$"GLOBAL_{type.ToString().ToUpper()}"];
-            }
-
-            catch (Exception) { }
-
-            string LogLine = $"[{DateTime.Now.ToString("MM.dd.yyy HH:mm:ss.fff")}] - {stringType}: {msg}";
-            try
-            {
-#if DEBUG
-                // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
-                Console.WriteLine(msg);
-#else
-                if (type == LogType.Error || type == LogType.Verbose)
-                {
-                    Console.WriteLine(LogLine);
-                }
-                File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
-#endif
-            }
-
-            catch (Exception ex)
-            {
-                Console.WriteLine("Well.. It looks like your machine can't event write to the log file. That's something else...");
-                Console.WriteLine(ex.GetExceptionInfo());
-            }
-
-            WritingLock.ExitWriteLock();
+            _logger = logger;
         }
 
         public void WriteVerbose(string msg)
         {
-            Write(msg, LogType.Verbose);
+            _logger.LogInformation(msg);
         }
 
         public void WriteDebug(string msg)
         {
-            Write(msg, LogType.Debug);
+            _logger.LogDebug(msg);
         }
 
         public void WriteError(string msg)
         {
-            Write(msg, LogType.Error);
+            _logger.LogError(msg);
         }
 
         public void WriteInfo(string msg)
         {
-            Write(msg, LogType.Info);
+            WriteVerbose(msg);
         }
 
         public void WriteWarning(string msg)
         {
-            Write(msg, LogType.Warning);
+            _logger.LogWarning(msg);
         }
 
         public void WriteAssert(bool condition, string msg)
         {
-            if (!condition)
-                Write(msg, LogType.Assert);
+            throw new NotImplementedException();
         }
     }
 }

Application/Misc/MasterCommunication.cs

@@ -8,6 +8,8 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -24,10 +26,9 @@ namespace IW4MAdmin.Application.Misc
         private readonly ApplicationConfiguration _appConfig;
         private readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
         private readonly int _apiVersion = 1;
-
         private bool firstHeartBeat = true;
 
-        public MasterCommunication(ILogger logger, ApplicationConfiguration appConfig, ITranslationLookup translationLookup, IMasterApi apiInstance, IManager manager)
+        public MasterCommunication(ILogger<MasterCommunication> logger, ApplicationConfiguration appConfig, ITranslationLookup translationLookup, IMasterApi apiInstance, IManager manager)
         {
             _logger = logger;
             _transLookup = translationLookup;
@@ -55,13 +56,7 @@ namespace IW4MAdmin.Application.Misc
 
             catch (Exception e)
             {
-                _logger.WriteWarning(_transLookup["MANAGER_VERSION_FAIL"]);
-                while (e.InnerException != null)
-                {
-                    e = e.InnerException;
-                }
-
-                _logger.WriteDebug(e.Message);
+                _logger.LogWarning(e, "Unable to retrieve IW4MAdmin version information");
             }
 
             if (version.CurrentVersionStable == _fallbackVersion)
@@ -110,12 +105,12 @@ namespace IW4MAdmin.Application.Misc
 
                 catch (System.Net.Http.HttpRequestException e)
                 {
-                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    _logger.LogWarning(e, "Could not send heartbeat");
                 }
 
                 catch (AggregateException e)
                 {
-                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    _logger.LogWarning(e, "Could not send heartbeat");
                     var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(ApiException));
 
                     foreach (var ex in exceptions)
@@ -129,7 +124,7 @@ namespace IW4MAdmin.Application.Misc
 
                 catch (ApiException e)
                 {
-                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    _logger.LogWarning(e, "Could not send heartbeat");
                     if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
                     {
                         connected = false;
@@ -138,7 +133,7 @@ namespace IW4MAdmin.Application.Misc
 
                 catch (Exception e)
                 {
-                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    _logger.LogWarning(e, "Could not send heartbeat");
                 }
 
 
@@ -202,7 +197,7 @@ namespace IW4MAdmin.Application.Misc
 
             if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)
             {
-                _logger.WriteWarning($"Response code from master is {response.ResponseMessage.StatusCode}, message is {response.StringContent}");
+                _logger.LogWarning("Non success response code from master is {statusCode}, message is {message}", response.ResponseMessage.StatusCode, response.StringContent);
             }
         }
     }

Application/Misc/MetaService.cs

@@ -7,6 +7,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -20,7 +22,7 @@ namespace IW4MAdmin.Application.Misc
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ILogger _logger;
 
-        public MetaService(ILogger logger, IDatabaseContextFactory contextFactory)
+        public MetaService(ILogger<MetaService> logger, IDatabaseContextFactory contextFactory)
         {
             _logger = logger;
             _metaActions = new Dictionary<MetaType, List<dynamic>>();

Application/Misc/MiddlewareActionHandler.cs

@@ -1,8 +1,9 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -11,7 +12,7 @@ namespace IW4MAdmin.Application.Misc
         private readonly IDictionary<string, IList<object>> _actions;
         private readonly ILogger _logger;
 
-        public MiddlewareActionHandler(ILogger logger)
+        public MiddlewareActionHandler(ILogger<MiddlewareActionHandler> logger)
         {
             _actions = new Dictionary<string, IList<object>>();
             _logger = logger;
@@ -38,8 +39,7 @@ namespace IW4MAdmin.Application.Misc
                     }
                     catch (Exception e) 
                     {
-                        _logger.WriteWarning($"Failed to invoke middleware action {name}");
-                        _logger.WriteDebug(e.GetExceptionInfo());
+                        _logger.LogWarning(e, "Failed to invoke middleware action {name}", name);
                     }
                 }
 

Application/Misc/PluginImporter.cs

@@ -5,9 +5,12 @@ using System.Reflection;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
 using SharedLibraryCore;
-using IW4MAdmin.Application.Misc;
+using IW4MAdmin.Application.API.Master;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Configuration;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace IW4MAdmin.Application.Helpers
+namespace IW4MAdmin.Application.Misc
 {
     /// <summary>
     /// implementation of IPluginImporter
@@ -15,12 +18,19 @@ namespace IW4MAdmin.Application.Helpers
     /// </summary>
     public class PluginImporter : IPluginImporter
     {
+        private IEnumerable<PluginSubscriptionContent> _pluginSubscription;
         private static readonly string PLUGIN_DIR = "Plugins";
         private readonly ILogger _logger;
+        private readonly IRemoteAssemblyHandler _remoteAssemblyHandler;
+        private readonly IMasterApi _masterApi;
+        private readonly ApplicationConfiguration _appConfig;
 
-        public PluginImporter(ILogger logger)
+        public PluginImporter(ILogger<PluginImporter> logger, ApplicationConfiguration appConfig, IMasterApi masterApi, IRemoteAssemblyHandler remoteAssemblyHandler)
         {
             _logger = logger;
+            _masterApi = masterApi;
+            _remoteAssemblyHandler = remoteAssemblyHandler;
+            _appConfig = appConfig;
         }
 
         /// <summary>
@@ -33,16 +43,16 @@ namespace IW4MAdmin.Application.Helpers
 
             if (Directory.Exists(pluginDir))
             {
-                string[] scriptPluginFiles = Directory.GetFiles(pluginDir, "*.js");
+                var scriptPluginFiles = Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts());
 
-                _logger.WriteInfo($"Discovered {scriptPluginFiles.Length} potential script plugins");
+                _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count());
 
-                if (scriptPluginFiles.Length > 0)
+                if (scriptPluginFiles.Count() > 0)
                 {
                     foreach (string fileName in scriptPluginFiles)
                     {
-                        _logger.WriteInfo($"Discovered script plugin {fileName}");
-                        var plugin = new ScriptPlugin(fileName);
+                        _logger.LogDebug("Discovered script plugin {fileName}", fileName);
+                        var plugin = new ScriptPlugin(_logger, fileName);
                         yield return plugin;
                     }
                 }
@@ -62,27 +72,70 @@ namespace IW4MAdmin.Application.Helpers
             if (Directory.Exists(pluginDir))
             {
                 var dllFileNames = Directory.GetFiles(pluginDir, "*.dll");
-                _logger.WriteInfo($"Discovered {dllFileNames.Length} potential plugin assemblies");
+                _logger.LogDebug("Discovered {count} potential plugin assemblies", dllFileNames.Length);
 
                 if (dllFileNames.Length > 0)
                 {
-                    var assemblies = dllFileNames.Select(_name => Assembly.LoadFrom(_name));
+                    // we only want to load the most recent assembly in case of duplicates
+                    var assemblies = dllFileNames.Select(_name => Assembly.LoadFrom(_name))
+                        .Union(GetRemoteAssemblies())
+                        .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
                         .SelectMany(_asm => _asm.GetTypes())
                         .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
 
-                    _logger.WriteInfo($"Discovered {pluginTypes.Count()} plugin implementations");
+                    _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
 
                     commandTypes = assemblies
                         .SelectMany(_asm => _asm.GetTypes())
                         .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
 
-                    _logger.WriteInfo($"Discovered {commandTypes.Count()} plugin commands");
+                    _logger.LogDebug("Discovered {count} plugin commands", commandTypes.Count());
                 }
             }
 
             return (pluginTypes, commandTypes);
         }
+
+        private IEnumerable<Assembly> GetRemoteAssemblies()
+        {
+            try
+            {
+                if (_pluginSubscription == null)
+                    _pluginSubscription = _masterApi.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
+
+                return _remoteAssemblyHandler.DecryptAssemblies(_pluginSubscription.Where(sub => sub.Type == PluginType.Binary).Select(sub => sub.Content).ToArray());
+            }
+
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Could not load remote assemblies");
+                return Enumerable.Empty<Assembly>();
+            }
+        }
+
+        private IEnumerable<string> GetRemoteScripts()
+        {
+            try
+            {
+                if (_pluginSubscription == null)
+                    _pluginSubscription = _masterApi.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
+
+                return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription.Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray());
+            }
+
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex,"Could not load remote scripts");
+                return Enumerable.Empty<string>();
+            }
+        }
+    }
+
+    public enum PluginType
+    {
+        Binary,
+        Script
     }
 }

Application/Misc/RemoteAssemblyHandler.cs

@@ -0,0 +1,76 @@
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc
+{
+    public class RemoteAssemblyHandler : IRemoteAssemblyHandler
+    {
+        private const int keyLength = 32;
+        private const int tagLength = 16;
+        private const int nonceLength = 12;
+        private const int iterationCount = 10000;
+
+        private readonly ApplicationConfiguration _appconfig;
+        private readonly ILogger _logger;
+
+        public RemoteAssemblyHandler(ILogger<RemoteAssemblyHandler> logger, ApplicationConfiguration appconfig)
+        {
+            _appconfig = appconfig;
+            _logger = logger;
+        }
+
+        public IEnumerable<Assembly> DecryptAssemblies(string[] encryptedAssemblies)
+        {
+            return DecryptContent(encryptedAssemblies)
+                .Select(decryptedAssembly => Assembly.Load(decryptedAssembly));
+        }
+
+        public IEnumerable<string> DecryptScripts(string[] encryptedScripts)
+        {
+            return DecryptContent(encryptedScripts).Select(decryptedScript => Encoding.UTF8.GetString(decryptedScript));
+        }
+
+        private byte[][] DecryptContent(string[] content)
+        {
+            if (string.IsNullOrEmpty(_appconfig.Id) || string.IsNullOrWhiteSpace(_appconfig.SubscriptionId))
+            {
+                _logger.LogWarning($"{nameof(_appconfig.Id)} and {nameof(_appconfig.SubscriptionId)} must be provided to attempt loading remote assemblies/scripts");
+                return new byte[0][];
+            }
+
+            var assemblies = content.Select(piece =>
+            {
+                byte[] byteContent = Convert.FromBase64String(piece);
+                byte[] encryptedContent = byteContent.Take(byteContent.Length - (tagLength + nonceLength)).ToArray();
+                byte[] tag = byteContent.Skip(byteContent.Length - (tagLength + nonceLength)).Take(tagLength).ToArray();
+                byte[] nonce = byteContent.Skip(byteContent.Length - nonceLength).Take(nonceLength).ToArray();
+                byte[] decryptedContent = new byte[encryptedContent.Length];
+
+                var keyGen = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(_appconfig.SubscriptionId), Encoding.UTF8.GetBytes(_appconfig.Id.ToString()), iterationCount, HashAlgorithmName.SHA512);
+                var encryption = new AesGcm(keyGen.GetBytes(keyLength));
+
+                try
+                {
+                    encryption.Decrypt(nonce, encryptedContent, tag, decryptedContent);
+                }
+
+                catch (CryptographicException ex)
+                {
+                    _logger.LogError(ex, "Could not decrypt remote plugin assemblies");
+                }
+
+                return decryptedContent;
+            });
+
+            return assemblies.ToArray();
+        }
+    }
+}

Application/Misc/ScriptCommand.cs

@@ -4,7 +4,9 @@ using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Database.Models.EFClient;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -14,13 +16,15 @@ namespace IW4MAdmin.Application.Misc
     public class ScriptCommand : Command
     {
         private readonly Action<GameEvent> _executeAction;
+        private readonly ILogger _logger;
 
         public ScriptCommand(string name, string alias, string description, bool isTargetRequired, Permission permission,
-            CommandArgument[] args, Action<GameEvent> executeAction, CommandConfiguration config, ITranslationLookup layout)
+            CommandArgument[] args, Action<GameEvent> executeAction, CommandConfiguration config, ITranslationLookup layout, ILogger<ScriptCommand> logger)
             : base(config, layout)
         {
 
             _executeAction = executeAction;
+            _logger = logger;
             Name = name;
             Alias = alias;
             Description = description;
@@ -29,14 +33,21 @@ namespace IW4MAdmin.Application.Misc
             Arguments = args;
         }
 
-        public override Task ExecuteAsync(GameEvent E)
+        public override async Task ExecuteAsync(GameEvent e)
         {
             if (_executeAction == null)
             {
                 throw new InvalidOperationException($"No execute action defined for command \"{Name}\"");
             }
 
-            return Task.Run(() => _executeAction(E));
+            try
+            {
+                await Task.Run(() => _executeAction(e));
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to execute ScriptCommand action for command {command} {@event}", Name, e);
+            }
         }
     }
 }

Application/Misc/ScriptPlugin.cs

@@ -1,4 +1,5 @@
-using Jint;
+using System;
+using Jint;
 using Jint.Native;
 using Jint.Runtime;
 using Microsoft.CSharp.RuntimeBinder;
@@ -12,6 +13,9 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -39,9 +43,11 @@ namespace IW4MAdmin.Application.Misc
         private readonly SemaphoreSlim _onProcessing;
         private bool successfullyLoaded;
         private readonly List<string> _registeredCommandNames;
+        private readonly ILogger _logger;
 
-        public ScriptPlugin(string filename, string workingDirectory = null)
+        public ScriptPlugin(ILogger logger, string filename, string workingDirectory = null)
         {
+            _logger = logger;
             _fileName = filename;
             Watcher = new FileSystemWatcher()
             {
@@ -84,7 +90,7 @@ namespace IW4MAdmin.Application.Misc
 
                     foreach (string commandName in _registeredCommandNames)
                     {
-                        manager.GetLogger(0).WriteDebug($"Removing plugin registered command \"{commandName}\"");
+                        _logger.LogDebug("Removing plugin registered command {command}", commandName);
                         manager.RemoveCommandByName(commandName);
                     }
 
@@ -129,7 +135,7 @@ namespace IW4MAdmin.Application.Misc
                     {
                         foreach (var command in GenerateScriptCommands(commands, scriptCommandFactory))
                         {
-                            manager.GetLogger(0).WriteDebug($"Adding plugin registered command \"{command.Name}\"");
+                            _logger.LogDebug("Adding plugin registered command {commandName}", command.Name);
                             manager.AddAdditionalCommand(command);
                             _registeredCommandNames.Add(command.Name);
                         }
@@ -167,12 +173,20 @@ namespace IW4MAdmin.Application.Misc
 
             catch (JavaScriptException ex)
             {
-                throw new PluginException($"An error occured while initializing script plugin: {ex.Error} (Line: {ex.Location.Start.Line}, Character: {ex.Location.Start.Column})") { PluginFile = _fileName };
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} initialization {@locationInfo}",
+                    nameof(OnLoadAsync), _fileName, ex.Location);
+                
+                throw new PluginException("An error occured while initializing script plugin");
             }
-
-            catch
+            
+            catch (Exception ex)
             {
-                throw;
+                _logger.LogError(ex,
+                    "Encountered unexpected error while running {methodName} for script plugin {plugin} with event type {eventType}",
+                    nameof(OnLoadAsync), _fileName);
+                
+                throw new PluginException("An unexpected error occured while initializing script plugin");
             }
 
             finally
@@ -197,10 +211,29 @@ namespace IW4MAdmin.Application.Misc
                     _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(S));
                     _scriptEngine.Execute("plugin.onEventAsync(_gameEvent, _server)").GetCompletionValue();
                 }
-
-                catch
+                
+                catch (JavaScriptException ex)
                 {
-                    throw;
+                    using (LogContext.PushProperty("Server", S.ToString()))
+                    {
+                        _logger.LogError(ex,
+                            "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} with event type {eventType} {@locationInfo}",
+                            nameof(OnEventAsync), _fileName, E.Type, ex.Location);
+                    }
+
+                    throw new PluginException($"An error occured while executing action for script plugin");
+                }
+
+                catch (Exception e)
+                {
+                    using (LogContext.PushProperty("Server", S.ToString()))
+                    {
+                        _logger.LogError(e,
+                            "Encountered unexpected error while running {methodName} for script plugin {plugin} with event type {eventType}",
+                            nameof(OnEventAsync), _fileName, E.Type);
+                    }
+
+                    throw new PluginException($"An error occured while executing action for script plugin");
                 }
 
                 finally
@@ -215,7 +248,7 @@ namespace IW4MAdmin.Application.Misc
 
         public Task OnLoadAsync(IManager manager)
         {
-            manager.GetLogger(0).WriteDebug($"OnLoad executing for {Name}");
+            _logger.LogDebug("OnLoad executing for {name}", Name);
             _scriptEngine.SetValue("_manager", manager);
             return Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
         }

Application/RCon/RConConnection.cs

@@ -11,6 +11,9 @@ using System.Net.Sockets;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.RCon
 {
@@ -23,11 +26,12 @@ namespace IW4MAdmin.Application.RCon
         public IPEndPoint Endpoint { get; private set; }
         public string RConPassword { get; private set; }
 
+        private IRConParser parser;
         private IRConParserConfiguration config;
         private readonly ILogger _log;
         private readonly Encoding _gameEncoding;
 
-        public RConConnection(string ipAddress, int port, string password, ILogger log, Encoding gameEncoding)
+        public RConConnection(string ipAddress, int port, string password, ILogger<RConConnection> log, Encoding gameEncoding)
         {
             Endpoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
             _gameEncoding = gameEncoding;
@@ -35,9 +39,10 @@ namespace IW4MAdmin.Application.RCon
             _log = log;
         }
 
-        public void SetConfiguration(IRConParserConfiguration config)
+        public void SetConfiguration(IRConParser parser)
         {
-            this.config = config;
+            this.parser = parser;
+            config = parser.Configuration;
         }
 
         public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
@@ -49,9 +54,8 @@ namespace IW4MAdmin.Application.RCon
 
             var connectionState = ActiveQueries[this.Endpoint];
 
-#if DEBUG == true
-            _log.WriteDebug($"Waiting for semaphore to be released [{this.Endpoint}]");
-#endif
+            _log.LogDebug("Waiting for semaphore to be released [{endpoint}]", Endpoint);
+
             // enter the semaphore so only one query is sent at a time per server.
             await connectionState.OnComplete.WaitAsync();
 
@@ -64,10 +68,8 @@ namespace IW4MAdmin.Application.RCon
 
             connectionState.LastQuery = DateTime.Now;
 
-#if DEBUG == true
-            _log.WriteDebug($"Semaphore has been released [{this.Endpoint}]");
-            _log.WriteDebug($"Query [{this.Endpoint},{type.ToString()},{parameters}]");
-#endif
+            _log.LogDebug("Semaphore has been released [{endpoint}]", Endpoint);
+            _log.LogDebug("Query {@queryInfo}", new { endpoint=Endpoint.ToString(), type, parameters });
 
             byte[] payload = null;
             bool waitForResponse = config.WaitForResponse;
@@ -112,15 +114,31 @@ namespace IW4MAdmin.Application.RCon
 
             // this happens when someone tries to send something that can't be converted into a 7 bit character set
             // e.g: emoji -> windows-1252
-            catch (OverflowException)
+            catch (OverflowException ex)
             {
                 connectionState.OnComplete.Release(1);
-                throw new NetworkException($"Invalid character encountered when converting encodings - {parameters}");
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogError(ex, "Could not convert RCon data payload to desired encoding {encoding} {params}",
+                        _gameEncoding.EncodingName, parameters);
+                }
+
+                throw new RConException($"Invalid character encountered when converting encodings");
             }
 
             byte[][] response = null;
 
-        retrySend:
+            retrySend:
+            if (connectionState.ConnectionAttempts > 1)
+            {
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogInformation(
+                        "Retrying RCon message ({connectionAttempts}/{allowedConnectionFailures} attempts) with parameters {payload}", 
+                        connectionState.ConnectionAttempts, 
+                        StaticHelpers.AllowedConnectionFails, parameters);
+                }
+            }
             using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
             {
                 DontFragment = true,
@@ -133,16 +151,19 @@ namespace IW4MAdmin.Application.RCon
                 connectionState.OnReceivedData.Reset();
                 connectionState.ConnectionAttempts++;
                 connectionState.BytesReadPerSegment.Clear();
-#if DEBUG == true
-                _log.WriteDebug($"Sending {payload.Length} bytes to [{this.Endpoint}] ({connectionState.ConnectionAttempts}/{StaticHelpers.AllowedConnectionFails})");
-#endif
+                bool exceptionCaught = false;
+
+                _log.LogDebug("Sending {payloadLength} bytes to [{endpoint}] ({connectionAttempts}/{allowedConnectionFailures})",
+                payload.Length, Endpoint, connectionState.ConnectionAttempts, StaticHelpers.AllowedConnectionFails);
+
                 try
                 {
-                    response = await SendPayloadAsync(payload, waitForResponse);
+                    
+                    response = await SendPayloadAsync(payload, waitForResponse, parser.OverrideTimeoutForCommand(parameters));
 
                     if ((response.Length == 0 || response[0].Length == 0) && waitForResponse)
                     {
-                        throw new NetworkException("Expected response but got 0 bytes back");
+                        throw new RConException("Expected response but got 0 bytes back");
                     }
 
                     connectionState.ConnectionAttempts = 0;
@@ -150,18 +171,28 @@ namespace IW4MAdmin.Application.RCon
 
                 catch
                 {
+                    // we want to retry with a delay
                     if (connectionState.ConnectionAttempts < StaticHelpers.AllowedConnectionFails)
                     {
-                        await Task.Delay(StaticHelpers.FloodProtectionInterval);
+                        exceptionCaught = true;
+                        await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
                         goto retrySend;
                     }
 
-                    throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMUNICATION"].FormatExt(Endpoint));
+                    using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                    {
+                        _log.LogWarning(
+                            "Made {connectionAttempts} attempts to send RCon data to server, but received no response",
+                            connectionState.ConnectionAttempts);
+                    }
+                    connectionState.ConnectionAttempts = 0;
+                    throw new NetworkException("Reached maximum retry attempts to send RCon data to server");
                 }
 
                 finally
                 {
-                    if (connectionState.OnComplete.CurrentCount == 0)
+                    // we don't want to release if we're going to retry the query
+                    if (connectionState.OnComplete.CurrentCount == 0 && !exceptionCaught)
                     {
                         connectionState.OnComplete.Release(1);
                     }
@@ -170,23 +201,22 @@ namespace IW4MAdmin.Application.RCon
 
             if (response.Length == 0)
             {
-                _log.WriteWarning($"Received empty response for request [{type.ToString()}, {parameters}, {Endpoint.ToString()}]");
+                _log.LogDebug("Received empty response for RCon request {@query}", new { endpoint=Endpoint.ToString(), type, parameters });
                 return new string[0];
             }
 
             string responseString = type == StaticHelpers.QueryType.COMMAND_STATUS ?
-               ReassembleSegmentedStatus(response) :
-               _gameEncoding.GetString(response[0]) + '\n';
+               ReassembleSegmentedStatus(response) : RecombineMessages(response);
 
             // note: not all games respond if the pasword is wrong or not set
             if (responseString.Contains("Invalid password") || responseString.Contains("rconpassword"))
             {
-                throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_INVALID"]);
+                throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_INVALID"]);
             }
 
             if (responseString.Contains("rcon_password"))
             {
-                throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_NOTSET"]);
+                throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_NOTSET"]);
             }
 
             if (responseString.Contains(config.ServerNotRunningResponse))
@@ -199,7 +229,13 @@ namespace IW4MAdmin.Application.RCon
 
             if (headerSplit.Length != 2)
             {
-                throw new NetworkException("Unexpected response header from server");
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogWarning("Invalid response header from server. Expected {expected}, but got {response}",
+                        config.CommandPrefixes.RConResponse, headerSplit.FirstOrDefault());
+                }
+
+                throw new RConException("Unexpected response header from server");
             }
 
             string[] splitResponse = headerSplit.Last().Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
@@ -234,7 +270,36 @@ namespace IW4MAdmin.Application.RCon
             return string.Join("", splitStatusStrings);
         }
 
-        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse)
+        /// <summary>
+        /// Recombines multiple game messages into one
+        /// </summary>
+        /// <param name="payload"></param>
+        /// <returns></returns>
+        private string RecombineMessages(byte[][] payload)
+        {
+            if (payload.Length == 1)
+            {
+                return _gameEncoding.GetString(payload[0]).TrimEnd('\n') + '\n';
+            }
+
+            else
+            {
+                var builder = new StringBuilder();
+                for (int i = 0; i < payload.Length; i++)
+                {
+                    string message = _gameEncoding.GetString(payload[i]).TrimEnd('\n') + '\n';
+                    if (i > 0)
+                    {
+                        message = message.Replace(config.CommandPrefixes.RConResponse, "");
+                    }
+                    builder.Append(message);
+                }
+                builder.Append('\n');
+                return builder.ToString();
+            }
+        }
+
+        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout)
         {
             var connectionState = ActiveQueries[this.Endpoint];
             var rconSocket = (Socket)connectionState.SendEventArgs.UserToken;
@@ -258,11 +323,17 @@ namespace IW4MAdmin.Application.RCon
 
             if (sendDataPending)
             {
-                // the send has not been completed asyncronously
-                if (!await Task.Run(() => connectionState.OnSentData.Wait(StaticHelpers.SocketTimeout)))
+                // the send has not been completed asynchronously
+                // this really shouldn't ever happen because it's UDP
+                if (!await Task.Run(() => connectionState.OnSentData.Wait(StaticHelpers.SocketTimeout(1))))
                 {
+                    using(LogContext.PushProperty("Server", Endpoint.ToString()))
+                    {
+                        _log.LogWarning("Socket timed out while sending RCon data on attempt {attempt}",
+                            connectionState.ConnectionAttempts);
+                    }
                     rconSocket.Close();
-                    throw new NetworkException("Timed out sending data", rconSocket);
+                    throw new NetworkException("Timed out sending RCon data", rconSocket);
                 }
             }
 
@@ -278,15 +349,37 @@ namespace IW4MAdmin.Application.RCon
 
             if (receiveDataPending)
             {
-                if (!await Task.Run(() => connectionState.OnReceivedData.Wait(10000)))
+                _log.LogDebug("Waiting to asynchronously receive data on attempt #{connectionAttempts}", connectionState.ConnectionAttempts);
+                if (!await Task.Run(() => connectionState.OnReceivedData.Wait(
+                    new[]
+                    {
+                        StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), 
+                        overrideTimeout
+                    }.Max())))
                 {
+                    if (connectionState.ConnectionAttempts > 1) // this reduces some spam for unstable connections
+                    {
+                        using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                        {
+                            _log.LogWarning(
+                                "Socket timed out while waiting for RCon response on attempt {attempt} with timeout delay of {timeout}",
+                                connectionState.ConnectionAttempts,
+                                StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
+                        }
+                    }
+
                     rconSocket.Close();
-                    throw new NetworkException("Timed out waiting for response", rconSocket);
+                    throw new NetworkException("Timed out receiving RCon response", rconSocket);
                 }
             }
 
             rconSocket.Close();
 
+            return GetResponseData(connectionState);
+        }
+
+        private byte[][] GetResponseData(ConnectionState connectionState)
+        {
             var responseList = new List<byte[]>();
             int totalBytesRead = 0;
 
@@ -305,9 +398,7 @@ namespace IW4MAdmin.Application.RCon
 
         private void OnDataReceived(object sender, SocketAsyncEventArgs e)
         {
-#if DEBUG == true
-            _log.WriteDebug($"Read {e.BytesTransferred} bytes from {e.RemoteEndPoint.ToString()}");
-#endif
+            _log.LogDebug("Read {bytesTransferred} bytes from {endpoint}", e.BytesTransferred, e.RemoteEndPoint);
 
             // this occurs when we close the socket
             if (e.BytesTransferred == 0)
@@ -330,9 +421,7 @@ namespace IW4MAdmin.Application.RCon
 
                         if (!sock.ReceiveAsync(state.ReceiveEventArgs))
                         {
-#if DEBUG == true
-                            _log.WriteDebug($"Read {state.ReceiveEventArgs.BytesTransferred} synchronous bytes from {e.RemoteEndPoint.ToString()}");
-#endif
+                            _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}", state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
                             // we need to increment this here because the callback isn't executed if there's no pending IO
                             state.BytesReadPerSegment.Add(state.ReceiveEventArgs.BytesTransferred);
                             ActiveQueries[this.Endpoint].OnReceivedData.Set();
@@ -354,9 +443,7 @@ namespace IW4MAdmin.Application.RCon
 
         private void OnDataSent(object sender, SocketAsyncEventArgs e)
         {
-#if DEBUG == true
-            _log.WriteDebug($"Sent {e.Buffer?.Length} bytes to {e.ConnectSocket?.RemoteEndPoint?.ToString()}");
-#endif
+            _log.LogDebug("Sent {byteCount} bytes to {endpoint}", e.Buffer?.Length, e.ConnectSocket?.RemoteEndPoint);
             ActiveQueries[this.Endpoint].OnSentData.Set();
         }
     }

Application/RconParsers/BaseRConParser.cs

@@ -8,14 +8,19 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Server;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.RconParsers
 {
     public class BaseRConParser : IRConParser
     {
-        public BaseRConParser(IParserRegexFactory parserRegexFactory)
+        private readonly ILogger _logger;
+        
+        public BaseRConParser(ILogger<BaseRConParser> logger, IParserRegexFactory parserRegexFactory)
         {
+            _logger = logger;
             Configuration = new DynamicRConParserConfiguration(parserRegexFactory)
             {
                 CommandPrefixes = new CommandPrefix()
@@ -76,7 +81,22 @@ namespace IW4MAdmin.Application.RconParsers
 
         public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default)
         {
-            string[] lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
+            string[] lineSplit;
+
+            try
+            {
+                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
+            }
+            catch
+            {
+                if (fallbackValue == null)
+                {
+                    throw;
+                }
+
+                lineSplit = new string[0];
+            }
+
             string response = string.Join('\n', lineSplit).TrimEnd('\0');
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
@@ -118,12 +138,7 @@ namespace IW4MAdmin.Application.RconParsers
         public virtual async Task<(List<EFClient>, string, string)> GetStatusAsync(IRConConnection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-#if DEBUG
-            foreach (var line in response)
-            {
-                Console.WriteLine(line);
-            }
-#endif
+            _logger.LogDebug("Status Response {@response}", (object)response);
             return (ClientsFromStatus(response), MapFromStatus(response), GameTypeFromStatus(response));
         }
 
@@ -263,5 +278,16 @@ namespace IW4MAdmin.Application.RconParsers
         public T GetDefaultDvarValue<T>(string dvarName) => Configuration.DefaultDvarValues.ContainsKey(dvarName) ?
             (T)Convert.ChangeType(Configuration.DefaultDvarValues[dvarName], typeof(T)) :
             default;
+
+        public TimeSpan OverrideTimeoutForCommand(string command)
+        {
+            if (command.Contains("map_rotate", StringComparison.InvariantCultureIgnoreCase) ||
+                command.StartsWith("map ", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return TimeSpan.FromSeconds(30);
+            }
+
+            return TimeSpan.Zero;
+        }
     }
 }

Application/RconParsers/DynamicRConParser.cs

@@ -1,4 +1,5 @@
-using SharedLibraryCore.Interfaces;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.RconParsers
 {
@@ -8,7 +9,7 @@ namespace IW4MAdmin.Application.RconParsers
     /// </summary>
     sealed internal class DynamicRConParser : BaseRConParser
     {
-        public DynamicRConParser(IParserRegexFactory parserRegexFactory) : base(parserRegexFactory)
+        public DynamicRConParser(ILogger<BaseRConParser> logger, IParserRegexFactory parserRegexFactory) : base(logger, parserRegexFactory)
         {
         }
     }

DeploymentFiles/deployment-pipeline.yml

@@ -1,8 +1,11 @@
+name: '$(Date:yyyy.MM.dd)$(Rev:.r)'
+
 trigger:
   batch: true
   branches:
     include:
     - release/pre
+    - master
 
 pr: none
 
@@ -12,110 +15,132 @@ pool:
 variables:
   solution: 'IW4MAdmin.sln'
   buildPlatform: 'Any CPU'
-  buildConfiguration: 'Prerelease'
   outputFolder: '$(Build.ArtifactStagingDirectory)\Publish\$(buildConfiguration)'
+  releaseType: verified
+  buildConfiguration: Stable
+  isPreRelease: false
 
 steps:
-- task: NuGetToolInstaller@1
+- task: PowerShell@2
+  displayName: 'Setup Pre-Release configuration'
+  condition: eq(variables['Build.SourceBranch'], 'refs/heads/release/pre')
+  inputs:
+    targetType: 'inline'
+    script: |
+            echo '##vso[task.setvariable variable=releaseType]prerelease'
+            echo '##vso[task.setvariable variable=buildConfiguration]Prerelease'
+            echo '##vso[task.setvariable variable=isPreRelease]true'
+    failOnStderr: true
 
 - task: NuGetCommand@2
+  displayName: 'Restore nuget packages'
   inputs:
     restoreSolution: '$(solution)'
 
 - task: PowerShell@2
+  displayName: 'Preload external resources'
   inputs:
     targetType: 'inline'
     script: |
+            Write-Host 'Build Configuration is $(buildConfiguration), Release Type is $(releaseType)'
             md -Force lib\open-iconic\font\css
             wget https://raw.githubusercontent.com/iconic/open-iconic/master/font/css/open-iconic-bootstrap.scss -o lib\open-iconic\font\css\open-iconic-bootstrap.scss
     failOnStderr: true
     workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore\wwwroot'
 
-- task: projectversionasvariable@1
-  inputs:
-    path: '$(Build.Repository.LocalPath)\Application\Application.csproj'
-
 - task: VSBuild@1
+  displayName: 'Build projects'
   inputs:
     solution: '$(solution)'
-    msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(Version.Major).$(Version.Minor).$(Version.Build).$(Build.BuildId)'
+    msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(Build.BuildNumber)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
 - task: DotNetCoreCLI@2
+  displayName: 'Publish projects'
   inputs:
     command: 'publish'
     publishWebProjects: false
     projects: |
       **/WebfrontCore.csproj
       **/Application.csproj
-    arguments: '-c $(buildConfiguration) -o $(outputFolder) /p:Version=$(Version.Major).$(Version.Minor).$(Version.Build).$(Build.BuildId)'
+    arguments: '-c $(buildConfiguration) -o $(outputFolder) /p:Version=$(Build.BuildNumber)'
     zipAfterPublish: false
     modifyOutputPath: false
     
 - task: PowerShell@2
+  displayName: 'Run publish script 1'
   inputs:
-    targetType: 'inline'
-    script: 'wget https://raidmax.org/downloads/dos2unix.exe'
-    failOnStderr: true
-    workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
-
-- task: PowerShell@2
-  inputs:
-    filePath: 'PostPublish.ps1'
+    filePath: 'DeploymentFiles/PostPublish.ps1'
     arguments: '$(outputFolder)'
     failOnStderr: true
     workingDirectory: '$(Build.Repository.LocalPath)'
 
 - task: BatchScript@1
+  displayName: 'Run publish script 2'
   inputs:
     filename: 'Application\BuildScripts\PostPublish.bat'
     workingFolder: '$(Build.Repository.LocalPath)'
     arguments: '$(outputFolder)'
     failOnStandardError: true
 
+- task: PowerShell@2
+  displayName: 'Download dos2unix for line endings'
+  inputs:
+    targetType: 'inline'
+    script: 'wget https://raidmax.org/downloads/dos2unix.exe'
+    failOnStderr: true
+    workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
+
 - task: CmdLine@2
+  displayName: 'Convert Linux start script line endings'
   inputs:
     script: |
       echo changing to encoding for linux start script
       dos2unix $(outputFolder)\StartIW4MAdmin.sh
       echo creating website version filename
-      @echo IW4MAdmin-$(Version.Major).$(Version.Minor)-$(buildConfiguration)$(Version.Build)b$(Build.BuildId) > $(Build.ArtifactStagingDirectory)\version_prerelease.txt
+      @echo IW4MAdmin-$(Build.BuildNumber) > $(Build.ArtifactStagingDirectory)\version_$(releaseType).txt
     workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
 
 - task: CopyFiles@2
+  displayName: 'Move script plugins into publish directory'
   inputs:
     SourceFolder: '$(Build.Repository.LocalPath)\Plugins\ScriptPlugins'
     Contents: '*.js'
     TargetFolder: '$(outputFolder)\Plugins'
 
 - task: CopyFiles@2
+  displayName: 'Move binary plugins into publish directory'
   inputs:
     SourceFolder: '$(Build.Repository.LocalPath)\BUILD\Plugins\'
     Contents: '*.dll'
     TargetFolder: '$(outputFolder)\Plugins'
 
 - task: CmdLine@2
+  displayName: 'Move webfront resources into publish directory'
   inputs:
    script: 'xcopy /s /y /f wwwroot $(outputFolder)\wwwroot'
    workingDirectory: '$(Build.Repository.LocalPath)\BUILD\Plugins'
    failOnStderr: true
 
 - task: CmdLine@2
+  displayName: 'Move gamescript files into publish directory'
   inputs:
    script: 'echo d | xcopy /s /y /f GameFiles $(outputFolder)\GameFiles'
    workingDirectory: '$(Build.Repository.LocalPath)'
    failOnStderr: true
 
 - task: ArchiveFiles@2
+  displayName: 'Generate final zip file'
   inputs:
     rootFolderOrFile: '$(outputFolder)'
     includeRootFolder: false
     archiveType: 'zip'
-    archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Version.Major).$(Version.Minor)-$(buildConfiguration)$(Version.Build)b$(Build.BuildId).zip'
+    archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
     replaceExistingArchive: true
 
 - task: FtpUpload@2
+  displayName: 'Upload zip file to website'
   inputs:
     credentialsOption: 'inputs'
     serverUrl: '$(FTPUrl)'
@@ -130,13 +155,14 @@ steps:
     trustSSL: false
 
 - task: FtpUpload@2
+  displayName: 'Upload version info to website'
   inputs:
     credentialsOption: 'inputs'
     serverUrl: '$(FTPUrl)'
     username: '$(FTPUsername)'
     password: '$(FTPPassword)'
     rootDirectory: '$(Build.ArtifactStagingDirectory)'
-    filePatterns: 'version_prerelease.txt'
+    filePatterns: 'version_$(releaseType).txt'
     remoteDirectory: 'IW4MAdmin'
     clean: false
     cleanContents: false
@@ -144,27 +170,29 @@ steps:
     trustSSL: false
 
 - task: GitHubRelease@1
+  displayName: 'Make GitHub release'
   inputs:
     gitHubConnection: 'github.com_RaidMax'
     repositoryName: 'RaidMax/IW4M-Admin'
     action: 'create'
     target: '$(Build.SourceVersion)'
     tagSource: 'userSpecifiedTag'
-    tag: '$(Version.Major).$(Version.Minor)-$(buildConfiguration)$(Version.Build)b$(Build.BuildId)'
-    title: 'Version $(Version.Major).$(Version.Minor) $(buildConfiguration) Feature $(Version.Build) Build $(Build.BuildId)'
+    tag: '$(Build.BuildNumber)-$(releaseType)'
+    title: 'IW4MAdmin $(Build.BuildNumber) ($(releaseType))'
     assets: '$(Build.ArtifactStagingDirectory)/*.zip'
-    isPreRelease: true
+    isPreRelease: $(isPreRelease)
     releaseNotesSource: 'inline'
     releaseNotesInline: 'todo'
     changeLogCompareToRelease: 'lastNonDraftRelease'
     changeLogType: 'commitBased'
 
 - task: PowerShell@2
+  displayName: 'Update master version'
   inputs:
     targetType: 'inline'
     script: |
       $payload = @{
-          'current-version-prerelease' = '$(Version.Major).$(Version.Minor).$(Version.Build).$(Build.BuildId)'
+          'current-version-$(releaseType)' = '$(Build.BuildNumber)'
           'jwt-secret' = '$(JWTSecret)'
       } | ConvertTo-Json
               
@@ -179,7 +207,8 @@ steps:
       Invoke-RestMethod @params
 
 - task: PublishPipelineArtifact@1
+  displayName: 'Publish artifact for analysis'
   inputs:
     targetPath: '$(outputFolder)'
     artifact: 'IW4MAdmin.$(buildConfiguration)'
-    publishLocation: 'pipeline'
+    publishLocation: 'pipeline'

IW4MAdmin.sln

@@ -8,11 +8,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
 		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
-		PostPublish.ps1 = PostPublish.ps1
-		pre-release-pipeline.yml = pre-release-pipeline.yml
+		DeploymentFiles\deployment-pipeline.yml = DeploymentFiles\deployment-pipeline.yml
+		DeploymentFiles\PostPublish.ps1 = DeploymentFiles\PostPublish.ps1
 		README.md = README.md
-		RunPublishPre.cmd = RunPublishPre.cmd
-		RunPublishRelease.cmd = RunPublishRelease.cmd
 		version.txt = version.txt
 	EndProjectSection
 EndProject
@@ -37,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ActionOnReport.js = Plugins\ScriptPlugins\ActionOnReport.js
 		Plugins\ScriptPlugins\ParserCoD4x.js = Plugins\ScriptPlugins\ParserCoD4x.js
 		Plugins\ScriptPlugins\ParserIW4x.js = Plugins\ScriptPlugins\ParserIW4x.js
+		Plugins\ScriptPlugins\ParserIW6x.js = Plugins\ScriptPlugins\ParserIW6x.js
 		Plugins\ScriptPlugins\ParserPIW5.js = Plugins\ScriptPlugins\ParserPIW5.js
 		Plugins\ScriptPlugins\ParserPT6.js = Plugins\ScriptPlugins\ParserPT6.js
 		Plugins\ScriptPlugins\ParserRektT5M.js = Plugins\ScriptPlugins\ParserRektT5M.js

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/LiveRadar.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

Plugins/LiveRadar/Plugin.cs

@@ -1,11 +1,12 @@
 using LiveRadar.Configuration;
 using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace LiveRadar
 {
@@ -21,11 +22,13 @@ namespace LiveRadar
         private readonly Dictionary<string, long> _botGuidLookups;
         private bool addedPage;
         private readonly object lockObject = new object();
+        private readonly ILogger _logger;
 
-        public Plugin(IConfigurationHandlerFactory configurationHandlerFactory)
+        public Plugin(ILogger<Plugin> logger, IConfigurationHandlerFactory configurationHandlerFactory)
         {
             _configurationHandler = configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
             _botGuidLookups = new Dictionary<string, long>();
+            _logger = logger;
         }
 
         public Task OnEventAsync(GameEvent E, Server S)
@@ -80,8 +83,7 @@ namespace LiveRadar
 
                 catch (Exception e)
                 {
-                    S.Logger.WriteWarning($"Could not parse live radar output: {e.Data}");
-                    S.Logger.WriteDebug(e.GetExceptionInfo());
+                    _logger.LogError(e, "Could not parse live radar output: {data}", e.Data);
                 }
             }
 

Plugins/Login/Login.csproj

@@ -23,7 +23,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ScriptPlugins/ParserIW6x.js

@@ -0,0 +1,45 @@
+var rconParser;
+var eventParser;
+
+var plugin = {
+    author: 'Xerxes, RaidMax',
+    version: 0.2,
+    name: 'IW6x Parser',
+    isParser: true,
+
+    onEventAsync: function (gameEvent, server) {
+    },
+
+    onLoadAsync: function (manager) {
+        rconParser = manager.GenerateDynamicRConParser(this.name);
+        eventParser = manager.GenerateDynamicEventParser(this.name);
+
+        rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
+        rconParser.Configuration.CommandPrefixes.Say = 'say {0}';
+        rconParser.Configuration.CommandPrefixes.Kick = 'clientkick {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.Ban = 'clientkick {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick {0} "{1}"';
+        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint\n';
+        rconParser.Configuration.Dvar.Pattern = '^ *\\"(.+)\\" is: \\"(.+)?\\" default: \\"(.+)?\\"\\n(?:latched: \\"(.+)?\\"\\n)? *(.+)$';
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +(Yes|No) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown|bot) +(-*[0-9]+) *$';
+        rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +address +qport *';
+        rconParser.Configuration.WaitForResponse = false;
+        rconParser.Configuration.Status.AddMapping(102, 4);
+        rconParser.Configuration.Status.AddMapping(103, 5);
+        rconParser.Configuration.Status.AddMapping(104, 6);
+        rconParser.Configuration.DefaultDvarValues.Add('g_log', 'games_mp.log'); // todo: remove this once proper log support is implemented
+        rconParser.Configuration.DefaultDvarValues.Add('g_logsync', '1'); // todo: remove this once proper log support is implemented
+
+        rconParser.Version = 'IW6 MP 3.15 build 2 Sat Sep 14 2013 03:58:30PM win64';
+        rconParser.GameName = 4; // IW6
+        eventParser.Version = 'IW6 MP 3.15 build 2 Sat Sep 14 2013 03:58:30PM win64';
+        eventParser.GameName = 4; // IW6
+        eventParser.Configuration.GameDirectory = 'iw6x';
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/ScriptPlugins/ParserRektT5M.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.2,
+    version: 0.3,
     name: 'RektT5m Parser',
     isParser: true,
 
@@ -16,7 +16,7 @@ var plugin = {
 
         eventParser.Configuration.GameDirectory = 'data';
 
-        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff\x01print';
+        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff\x01print\n';
         rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
         rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;
 

Plugins/Stats/Cheat/Detection.cs

@@ -1,13 +1,13 @@
 using IW4MAdmin.Plugins.Stats.Models;
-using SharedLibraryCore;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Plugins.Stats.Cheat
 {
@@ -223,11 +223,6 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                 if (weightedSessionAverage > Thresholds.MaxOffset(totalSessionHits) &&
                     totalSessionHits >= (Thresholds.MediumSampleMinKills * 2))
                 {
-                    Log.WriteDebug("*** Reached Max Session Average for Angle Difference ***");
-                    Log.WriteDebug($"Session Average = {weightedSessionAverage}");
-                    Log.WriteDebug($"HitCount = {HitCount}");
-                    Log.WriteDebug($"ID = {hit.AttackerId}");
-
                     results.Add(new DetectionPenaltyResult()
                     {
                         ClientPenalty = EFPenalty.PenaltyType.Ban,
@@ -237,18 +232,14 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
                         Location = hitLoc.Location
                     });
                 }
-
-#if DEBUG
-                Log.WriteDebug($"PredictVsReal={realAgainstPredict}");
-#endif
+                
+                Log.LogDebug("PredictVsReal={realAgainstPredict}", realAgainstPredict);
             }
             #endregion
 
             #region STRAIN
             double currentStrain = Strain.GetStrain(hit.Distance / 0.0254, hit.ViewAngles, Math.Max(50, LastOffset == 0 ? 50 : (hit.TimeOffset - LastOffset)));
-#if DEBUG == true
-            Log.WriteDebug($"Current Strain: {currentStrain}");
-#endif
+            Log.LogDebug("Current Strain: {currentStrain}", currentStrain);
             LastOffset = hit.TimeOffset;
 
             if (currentStrain > ClientStats.MaxStrain)
@@ -331,18 +322,18 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             if (!shouldIgnoreDetection)
             {
                 validButtonHitCount++;
-            }
 
-            double lastDiff = hit.TimeOffset - hit.TimeSinceLastAttack;
-            if (validButtonHitCount > 0 && lastDiff <= 0)
-            {
-                results.Add(new DetectionPenaltyResult()
+                double lastDiff = hit.TimeOffset - hit.TimeSinceLastAttack;
+                if (validButtonHitCount > 0 && lastDiff <= 0)
                 {
-                    ClientPenalty = EFPenalty.PenaltyType.Ban,
-                    Value = lastDiff,
-                    HitCount = HitCount,
-                    Type = DetectionType.Button
-                });
+                    results.Add(new DetectionPenaltyResult()
+                    {
+                        ClientPenalty = EFPenalty.PenaltyType.Ban,
+                        Value = lastDiff,
+                        HitCount = HitCount,
+                        Type = DetectionType.Button
+                    });
+                }
             }
             #endregion
 

Plugins/Stats/Cheat/Strain.cs

@@ -27,12 +27,6 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             double[] distance = Utilities.AngleStuff(newAngle, LastAngle);
             LastDistance = distance[0] + distance[1];
 
-#if DEBUG == true
-            Console.WriteLine($"Angle Between = {LastDistance}");
-            Console.WriteLine($"Distance From Target = {killDistance}");
-            Console.WriteLine($"Time Offset = {deltaTime}");
-            Console.WriteLine($"Decay Factor = {decayFactor} ");
-#endif
             // this happens on first kill
             if ((distance[0] == 0 && distance[1] == 0) ||
                 deltaTime == 0 ||

Plugins/Stats/Helpers/MigrationHelper.cs

@@ -0,0 +1,7 @@
+namespace Stats.Helpers
+{
+    public class MigrationHelper
+    {
+        
+    }
+}

Plugins/Stats/Helpers/StatManager.cs

@@ -4,7 +4,6 @@ using IW4MAdmin.Plugins.Stats.Models;
 using IW4MAdmin.Plugins.Stats.Web.Dtos;
 using Microsoft.EntityFrameworkCore;
 using SharedLibraryCore;
-using SharedLibraryCore.Database;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
@@ -15,7 +14,9 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using static IW4MAdmin.Plugins.Stats.Cheat.Detection;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Plugins.Stats.Helpers
 {
@@ -30,10 +31,10 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         public static string CLIENT_STATS_KEY = "ClientStats";
         public static string CLIENT_DETECTIONS_KEY = "ClientDetections";
 
-        public StatManager(IManager mgr, IDatabaseContextFactory contextFactory, IConfigurationHandler<StatsConfiguration> configHandler)
+        public StatManager(ILogger<StatManager> logger, IManager mgr, IDatabaseContextFactory contextFactory, IConfigurationHandler<StatsConfiguration> configHandler)
         {
             _servers = new ConcurrentDictionary<long, ServerStats>();
-            _log = mgr.GetLogger(0);
+            _log = logger;
             _contextFactory = contextFactory;
             _configHandler = configHandler;
         }
@@ -265,8 +266,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             catch (Exception e)
             {
-                _log.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_STATS_ERROR_ADD"]} - {e.Message}");
-                _log.WriteDebug(e.GetExceptionInfo());
+                _log.LogError(e, "{message}", Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_STATS_ERROR_ADD"]);
             }
         }
 
@@ -283,7 +283,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
                 if (!_servers.ContainsKey(serverId))
                 {
-                    _log.WriteError($"[Stats::AddPlayer] Server with id {serverId} could not be found");
+                    _log.LogError("[Stats::AddPlayer] Server with id {serverId} could not be found", serverId);
                     return null;
                 }
 
@@ -360,7 +360,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                     clientStats.LastScore = pl.Score;
 
                     pl.SetAdditionalProperty(CLIENT_DETECTIONS_KEY, new Detection(_log, clientStats));
-                    pl.CurrentServer.Logger.WriteInfo($"Added {pl} to stats");
+                    _log.LogDebug("Added {client} to stats", pl.ToString());
                 }
 
                 return clientStats;
@@ -368,8 +368,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             catch (Exception ex)
             {
-                _log.WriteWarning("Could not add client to stats");
-                _log.WriteDebug(ex.GetExceptionInfo());
+                _log.LogError(ex, "Could not add client to stats {@client}", pl);
             }
 
             return null;
@@ -382,11 +381,11 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         /// <returns></returns>
         public async Task RemovePlayer(EFClient pl)
         {
-            pl.CurrentServer.Logger.WriteInfo($"Removing {pl} from stats");
+            _log.LogDebug("Removing {client} from stats", pl.ToString());
 
             if (pl.CurrentServer == null)
             {
-                pl.CurrentServer.Logger.WriteWarning($"Disconnecting client {pl} is not on a server, state is {pl.State}");
+                _log.LogWarning("Disconnecting client {@client} is not on a server", pl);
                 return;
             }
 
@@ -407,7 +406,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             else
             {
-                pl.CurrentServer.Logger.WriteWarning($"Disconnecting client {pl} has not been added to stats, state is {pl.State}");
+                _log.LogWarning("Disconnecting client {@client} has not been added to stats", pl);
             }
         }
 
@@ -452,10 +451,9 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                     }
                 }
 
-                catch (FormatException)
+                catch (FormatException ex)
                 {
-                    _log.WriteError("Could not parse vector data from hit");
-                    _log.WriteDebug($"Kill - {killOrigin} Death - {deathOrigin} ViewAngle - {viewAngles} Snapshot - {string.Join(",", snapshotAngles.Select(_a => _a.ToString()))}");
+                    _log.LogWarning(ex, "Could not parse vector data from hit");
                     return;
                 }
 
@@ -527,8 +525,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
                     catch (Exception e)
                     {
-                        _log.WriteError("Could not store client kills");
-                        _log.WriteDebug(e.GetExceptionInfo());
+                        _log.LogError(e, "Could not store client kills");
                     }
 
                     finally
@@ -583,9 +580,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             catch (TaskCanceledException) { }
             catch (Exception ex)
             {
-                _log.WriteError("Could not save hit or AC info");
-                _log.WriteDebug(ex.GetExceptionInfo());
-                _log.WriteDebug($"Attacker: {attacker} Victim: {victim}, ServerId {serverId}");
+                _log.LogError(ex, "Could not save hit or anti-cheat info {@attacker} {@victim} {server}", attacker, victim, serverId);
             }
 
             finally
@@ -633,7 +628,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             try
             {
-                if (detectionTypes[server.EndPoint].Contains(detectionType))
+                if (!detectionTypes[server.EndPoint].Contains(detectionType))
                 {
                     return false;
                 }
@@ -714,9 +709,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             var attackerStats = attacker.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
             var victimStats = victim.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
 
-#if DEBUG
-            _log.WriteDebug("Processing standard kill");
-#endif
             // update the total stats
             _servers[serverId].ServerStatistics.TotalKills += 1;
 
@@ -754,14 +746,14 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             // fixme: why?
             if (double.IsNaN(victimStats.SPM) || double.IsNaN(victimStats.Skill))
             {
-                _log.WriteDebug($"[StatManager::AddStandardKill] victim SPM/SKILL {victimStats.SPM} {victimStats.Skill}");
+                _log.LogWarning("victim SPM/SKILL {@victimStats}", victimStats);
                 victimStats.SPM = 0.0;
                 victimStats.Skill = 0.0;
             }
 
             if (double.IsNaN(attackerStats.SPM) || double.IsNaN(attackerStats.Skill))
             {
-                _log.WriteDebug($"[StatManager::AddStandardKill] attacker SPM/SKILL {victimStats.SPM} {victimStats.Skill}");
+                _log.LogWarning("attacker SPM/SKILL {@attackerStats}", attackerStats);
                 attackerStats.SPM = 0.0;
                 attackerStats.Skill = 0.0;
             }
@@ -781,8 +773,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
                 catch (Exception e)
                 {
-                    _log.WriteWarning($"Could not update stat history for {attacker}");
-                    _log.WriteDebug(e.GetExceptionInfo());
+                    _log.LogWarning(e, "Could not update stat history for {attacker}", attacker.ToString());
                 }
 
                 finally
@@ -1099,8 +1090,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             if (clientStats.SPM < 0)
             {
-                _log.WriteWarning("[StatManager:UpdateStats] clientStats SPM < 0");
-                _log.WriteDebug($"{scoreDifference}-{clientStats.RoundScore} - {clientStats.LastScore} - {clientStats.SessionScore}");
+                _log.LogWarning("clientStats SPM < 0 {scoreDifference} {@clientStats}", scoreDifference, clientStats);
                 clientStats.SPM = 0;
             }
 
@@ -1110,8 +1100,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             // fixme: how does this happen?
             if (double.IsNaN(clientStats.SPM) || double.IsNaN(clientStats.Skill))
             {
-                _log.WriteWarning("[StatManager::UpdateStats] clientStats SPM/Skill NaN");
-                _log.WriteDebug($"{killSPM}-{KDRWeight}-{totalPlayTime}-{SPMAgainstPlayWeight}-{clientStats.SPM}-{clientStats.Skill}-{scoreDifference}");
+                _log.LogWarning("clientStats SPM/Skill NaN {@killInfo}", new {killSPM, KDRWeight, totalPlayTime, SPMAgainstPlayWeight, clientStats, scoreDifference});
                 clientStats.SPM = 0;
                 clientStats.Skill = 0;
             }
@@ -1133,7 +1122,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
                 if (serverStats == null)
                 {
-                    _log.WriteDebug($"Initializing server stats for {serverId}");
+                    _log.LogDebug("Initializing server stats for {serverId}", serverId);
                     // server stats have never been generated before
                     serverStats = new EFServerStatistics()
                     {
@@ -1225,8 +1214,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             catch (Exception e)
             {
-                _log.WriteError("There was a probably syncing server stats");
-                _log.WriteDebug(e.GetExceptionInfo());
+                _log.LogError(e, "There was a problem syncing server stats");
             }
 
             finally

Plugins/Stats/Plugin.cs

@@ -14,6 +14,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace IW4MAdmin.Plugins.Stats
 {
@@ -28,23 +29,24 @@ namespace IW4MAdmin.Plugins.Stats
         public static StatManager Manager { get; private set; }
         public static IManager ServerManager;
         public static IConfigurationHandler<StatsConfiguration> Config { get; private set; }
-#if DEBUG
-        int scriptDamageCount;
-        int scriptKillCount;
-#endif
+
         private readonly IDatabaseContextFactory _databaseContextFactory;
         private readonly ITranslationLookup _translationLookup;
         private readonly IMetaService _metaService;
         private readonly IResourceQueryHelper<ChatSearchQuery, MessageResponse> _chatQueryHelper;
+        private readonly ILogger<StatManager> _managerLogger;
+        private readonly ILogger<Plugin> _logger;
 
-        public Plugin(IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory databaseContextFactory,
-            ITranslationLookup translationLookup, IMetaService metaService, IResourceQueryHelper<ChatSearchQuery, MessageResponse> chatQueryHelper)
+        public Plugin(ILogger<Plugin> logger, IConfigurationHandlerFactory configurationHandlerFactory, IDatabaseContextFactory databaseContextFactory,
+            ITranslationLookup translationLookup, IMetaService metaService, IResourceQueryHelper<ChatSearchQuery, MessageResponse> chatQueryHelper, ILogger<StatManager> managerLogger)
         {
             Config = configurationHandlerFactory.GetConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
             _databaseContextFactory = databaseContextFactory;
             _translationLookup = translationLookup;
             _metaService = metaService;
             _chatQueryHelper = chatQueryHelper;
+            _managerLogger = managerLogger;
+            _logger = logger;
         }
 
         public async Task OnEventAsync(GameEvent E, Server S)
@@ -102,23 +104,13 @@ namespace IW4MAdmin.Plugins.Stats
                         {
                             E.Origin = E.Target;
                         }
-
-#if DEBUG
-                        scriptKillCount++;
-                        S.Logger.WriteInfo($"Start ScriptKill {scriptKillCount}");
-#endif
-
                         await Manager.AddScriptHit(false, E.Time, E.Origin, E.Target, StatManager.GetIdForServer(S), S.CurrentMap.Name, killInfo[7], killInfo[8],
                             killInfo[5], killInfo[6], killInfo[3], killInfo[4], killInfo[9], killInfo[10], killInfo[11], killInfo[12], killInfo[13], killInfo[14], killInfo[15], killInfo[16], killInfo[17]);
-
-#if DEBUG
-                        S.Logger.WriteInfo($"End ScriptKill {scriptKillCount}");
-#endif
                     }
 
                     else
                     {
-                        S.Logger.WriteDebug("Skipping script kill as it is ignored or data in customcallbacks is outdated/missing");
+                        _logger.LogDebug("Skipping script kill as it is ignored or data in customcallbacks is outdated/missing");
                     }
                     break;
                 case GameEvent.EventType.Kill:
@@ -155,22 +147,13 @@ namespace IW4MAdmin.Plugins.Stats
                             E.Origin = E.Target;
                         }
 
-#if DEBUG
-                        scriptDamageCount++;
-                        S.Logger.WriteInfo($"Start ScriptDamage {scriptDamageCount}");
-#endif
-
                         await Manager.AddScriptHit(true, E.Time, E.Origin, E.Target, StatManager.GetIdForServer(S), S.CurrentMap.Name, killInfo[7], killInfo[8],
                             killInfo[5], killInfo[6], killInfo[3], killInfo[4], killInfo[9], killInfo[10], killInfo[11], killInfo[12], killInfo[13], killInfo[14], killInfo[15], killInfo[16], killInfo[17]);
-
-#if DEBUG
-                        S.Logger.WriteInfo($"End ScriptDamage {scriptDamageCount}");
-#endif
                     }
 
                     else
                     {
-                        S.Logger.WriteDebug("Skipping script damage as it is ignored or data in customcallbacks is outdated/missing");
+                        _logger.LogDebug("Skipping script damage as it is ignored or data in customcallbacks is outdated/missing");
                     }
                     break;
             }
@@ -457,7 +440,7 @@ namespace IW4MAdmin.Plugins.Stats
             manager.GetMessageTokens().Add(new MessageToken("MOSTKILLS", mostKills));
 
             ServerManager = manager;
-            Manager = new StatManager(manager, _databaseContextFactory, Config);
+            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config);
         }
 
         public Task OnTickAsync(Server S)

Plugins/Stats/Stats.csproj

@@ -13,13 +13,15 @@
     <Copyright>2018</Copyright>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <LangVersion>8.0</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\Build\Plugins --no-build --no-restore --no-dependencies" />
   </Target>
+
 </Project>

Plugins/Web/StatsWeb/API/StatsController.cs

@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using Stats.Dtos;
 using System;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace StatsWeb.API
 {
@@ -16,7 +17,7 @@ namespace StatsWeb.API
         private readonly ILogger _logger;
         private readonly IResourceQueryHelper<StatsInfoRequest, StatsInfoResult> _statsQueryHelper;
 
-        public StatsController(ILogger logger, IResourceQueryHelper<StatsInfoRequest, StatsInfoResult> statsQueryHelper)
+        public StatsController(ILogger<StatsController> logger, IResourceQueryHelper<StatsInfoRequest, StatsInfoResult> statsQueryHelper)
         {
             _statsQueryHelper = statsQueryHelper;
             _logger = logger;
@@ -56,8 +57,7 @@ namespace StatsWeb.API
 
             catch (Exception e)
             {
-                _logger.WriteWarning($"Could not get client stats for client id {clientId}");
-                _logger.WriteDebug(e.GetExceptionInfo());
+                _logger.LogWarning(e, "Could not get client stats for client id {clientId}", clientId);
 
                 return StatusCode(StatusCodes.Status500InternalServerError, new ErrorResponse
                 {

Plugins/Web/StatsWeb/ChatResourceQueryHelper.cs

@@ -10,6 +10,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace StatsWeb
 {
@@ -23,7 +25,7 @@ namespace StatsWeb
         private readonly ApplicationConfiguration _appConfig;
         private List<EFServer> serverCache;
 
-        public ChatResourceQueryHelper(ILogger logger, IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
+        public ChatResourceQueryHelper(ILogger<ChatResourceQueryHelper> logger, IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
         {
             _contextFactory = contextFactory;
             _logger = logger;

Plugins/Web/StatsWeb/Controllers/StatsController.cs

@@ -10,8 +10,11 @@ using SharedLibraryCore.Interfaces;
 using Stats.Dtos;
 using StatsWeb.Extensions;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
 {
@@ -22,7 +25,7 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
         private readonly IResourceQueryHelper<ChatSearchQuery, MessageResponse> _chatResourceQueryHelper;
         private readonly ITranslationLookup _translationLookup;
 
-        public StatsController(ILogger logger, IManager manager, IResourceQueryHelper<ChatSearchQuery, MessageResponse> resourceQueryHelper,
+        public StatsController(ILogger<StatsController> logger, IManager manager, IResourceQueryHelper<ChatSearchQuery, MessageResponse> resourceQueryHelper,
             ITranslationLookup translationLookup) : base(manager)
         {
             _logger = logger;
@@ -86,7 +89,7 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
                 SentAfter = whenLower
             });
 
-            return View("_MessageContext", messages.Results);
+            return View("_MessageContext", messages.Results.ToList());
         }
 
         [HttpGet("Message/Find")]
@@ -108,15 +111,13 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
 
             catch (ArgumentException e)
             {
-                _logger.WriteWarning($"Could not parse chat message search query - {query}");
-                _logger.WriteDebug(e.GetExceptionInfo());
+                _logger.LogWarning(e, "Could not parse chat message search query {query}", query);
                 ViewBag.Error = e;
             }
 
             catch (FormatException e)
             {
-                _logger.WriteWarning($"Could not parse chat message search query filter format - {query}");
-                _logger.WriteDebug(e.GetExceptionInfo());
+                _logger.LogWarning(e, "Could not parse chat message search query filter format {query}", query);
                 ViewBag.Error = e;
             }
 
@@ -136,15 +137,13 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
 
             catch (ArgumentException e)
             {
-                _logger.WriteWarning($"Could not parse chat message search query - {query}");
-                _logger.WriteDebug(e.GetExceptionInfo());
+                _logger.LogWarning(e, "Could not parse chat message search query {query}", query);
                 throw;
             }
 
             catch (FormatException e)
             {
-                _logger.WriteWarning($"Could not parse chat message search query filter format - {query}");
-                _logger.WriteDebug(e.GetExceptionInfo());
+                _logger.LogWarning(e, "Could not parse chat message search query filter format {query}", query);
                 throw;
             }
 
@@ -189,13 +188,13 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
                 // we want to show anything related to the automated offense 
                 else
                 {
-                    return View("_MessageContext", new[]
+                    return View("_MessageContext", new List<MessageResponse>
                     {
-                        new ChatInfo()
+                        new MessageResponse()
                         {
                             ClientId = penalty.OffenderId,
                             Message = penalty.AutomatedOffense,
-                            Time = penalty.When
+                            When = penalty.When
                         }
                     });
                 }

Plugins/Web/StatsWeb/StatsWeb.csproj

@@ -14,7 +14,7 @@
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,7 +28,7 @@
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
-
+  
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\..\BUILD\Plugins --no-build --no-restore --no-dependencies" />
   </Target>

Plugins/Web/StatsWeb/Views/Stats/Components/TopPlayers/_List.cshtml

@@ -6,21 +6,37 @@
     string rankIcon(double elo)
     {
         if (elo >= getDeviation(-0.75) && elo < getDeviation(1.25))
+        {
             return "0_no-place/menu_div_no_place.png";
+        }
         if (elo >= getDeviation(0.125) && elo < getDeviation(0.625))
+        {
             return "1_iron/menu_div_iron_sub03.png";
+        }
         if (elo >= getDeviation(0.625) && elo < getDeviation(1.0))
+        {
             return "2_bronze/menu_div_bronze_sub03.png";
+        }
         if (elo >= getDeviation(1.0) && elo < getDeviation(1.25))
+        {
             return "3_silver/menu_div_silver_sub03.png";
+        }
         if (elo >= getDeviation(1.25) && elo < getDeviation(1.5))
+        {
             return "4_gold/menu_div_gold_sub03.png";
+        }
         if (elo >= getDeviation(1.5) && elo < getDeviation(1.75))
+        {
             return "5_platinum/menu_div_platinum_sub03.png";
+        }
         if (elo >= getDeviation(1.75) && elo < getDeviation(2.0))
+        {
             return "6_semipro/menu_div_semipro_sub03.png";
+        }
         if (elo >= getDeviation(2.0))
+        {
             return "7_pro/menu_div_pro_sub03.png";
+        }
 
         return "0_no-place/menu_div_no_place.png";
     }

Plugins/Web/StatsWeb/Views/Stats/_MessageContext.cshtml

@@ -1,5 +1,5 @@
 @using SharedLibraryCore.Dtos.Meta.Responses
-@model IEnumerable<MessageResponse>
+@model IList<MessageResponse>
 @{
     Layout = null;
 }

Plugins/Welcome/Welcome.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2020.11.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

RunPublishPre.cmd

@@ -1,7 +0,0 @@
-dotnet publish WebfrontCore/WebfrontCore.csproj -c Prerelease -f netcoreapp3.0 --force -o X:\IW4MAdmin\Publish\WindowsPrerelease /p:PublishProfile=Prerelease
-dotnet publish Application/Application.csproj -c Prerelease -f netcoreapp3.0 --force -o X:\IW4MAdmin\Publish\WindowsPrerelease /p:PublishProfile=Prerelease
-dotnet publish GameLogServer/GameLogServer.pyproj -c Release -f netcoreapp3.0 --force -o X:\IW4MAdmin\Publish\WindowsPrerelease\GameLogServer
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
-msbuild  GameLogServer/GameLogServer.pyproj  /p:PublishProfile=PreRelease /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\GameLogServer\
-cd "X:\IW4MAdmin\DEPLOY\"
-PowerShell ".\upload_prerelease.ps1"

RunPublishRelease.cmd

@@ -1,7 +0,0 @@
-dotnet publish WebfrontCore/WebfrontCore.csproj -c Release -f netcoreapp3.0 --force -o X:\IW4MAdmin\Publish\Windows /p:PublishProfile=sTABLE
-dotnet publish Application/Application.csproj -c Release -f netcoreapp3.0 --force -o X:\IW4MAdmin\Publish\Windows /p:PublishProfile=Stable
-dotnet publish GameLogServer/GameLogServer.pyproj -c Release -f netcoreapp3.0 --force -o X:\IW4MAdmin\Publish\WindowsPrerelease\GameLogServer
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
-msbuild  GameLogServer/GameLogServer.pyproj  /p:PublishProfile=Stable /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\GameLogServer\
-cd "X:\IW4MAdmin\DEPLOY\"
-PowerShell ".\upload_release.ps1"

SharedLibraryCore/Command.cs

@@ -6,6 +6,7 @@ using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using static SharedLibraryCore.Server;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace SharedLibraryCore
 {

SharedLibraryCore/Commands/NativeCommands.cs

@@ -12,6 +12,8 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
 
 namespace SharedLibraryCore.Commands
@@ -239,6 +241,42 @@ namespace SharedLibraryCore.Commands
         }
     }
 
+    /// <summary>
+    /// Prints out a message to all clients on all servers
+    /// </summary>
+    public class SayAllCommand : Command
+    {
+        public SayAllCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        {
+            Name = "sayall";
+            Description = _translationLookup["COMMANDS_SAY_ALL_DESC"];
+            Alias = "sa";
+            Permission = Permission.Moderator;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument()
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
+                    Required = true
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent E)
+        {
+            string message = _translationLookup["COMMANDS_SAY_ALL_MESSAGE_FORMAT"].FormatExt(E.Origin.Name, E.Data);
+
+            foreach (var server in E.Owner.Manager.GetServers())
+            {
+                server.Broadcast(message, E.Origin);
+            }
+
+            E.Origin.Tell(_translationLookup["COMMANDS_SAY_SUCCESS"]);
+            return Task.CompletedTask;
+        }
+    }
+
     /// <summary>
     /// Temporarily bans a client
     /// </summary>
@@ -596,11 +634,11 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            var _ = !E.Origin.Masked ?
+            _ = !E.Origin.Masked ?
                 E.Owner.Broadcast($"{_translationLookup["COMMANDS_MAPROTATE"]} [^5{E.Origin.Name}^7]", E.Origin) :
                 E.Owner.Broadcast(_translationLookup["COMMANDS_MAPROTATE"], E.Origin);
 
-            await Task.Delay(5000);
+            await Task.Delay(E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000);
             await E.Owner.ExecuteCommandAsync("map_rotate");
         }
     }
@@ -610,7 +648,7 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class SetLevelCommand : Command
     {
-        public SetLevelCommand(CommandConfiguration config, ITranslationLookup translationLookup, ILogger logger) : base(config, translationLookup)
+        public SetLevelCommand(CommandConfiguration config, ITranslationLookup translationLookup, ILogger<SetLevelCommand> logger) : base(config, translationLookup)
         {
             Name = "setlevel";
             Description = _translationLookup["COMMANDS_SETLEVEL_DESC"];
@@ -691,13 +729,16 @@ namespace SharedLibraryCore.Commands
                     gameEvent.Owner.Manager.GetActiveClients()
                     .FirstOrDefault(c => c.ClientId == targetClient?.ClientId) ?? targetClient : targetClient;
 
-                logger.WriteInfo($"Beginning set level of client {gameEvent.Origin} to {newPerm}");
+                logger.LogDebug("Beginning set level of client {origin} to {newPermission}", gameEvent.Origin.ToString(), newPerm);
 
                 var result = await targetClient.SetLevel(newPerm, gameEvent.Origin).WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
 
                 if (result.Failed)
                 {
-                    logger.WriteInfo($"Failed to set level of client {gameEvent.Origin}");
+                    using (LogContext.PushProperty("Server", gameEvent.Origin.CurrentServer?.ToString()))
+                    {
+                        logger.LogWarning("Failed to set level of client {origin}", gameEvent.Origin.ToString());
+                    }
                     gameEvent.Origin.Tell(_translationLookup["SERVER_ERROR_COMMAND_INGAME"]);
                     return;
                 }
@@ -828,22 +869,18 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent E)
         {
-            string newMap = E.Data.Trim().ToLower();
-            foreach (Map m in E.Owner.Maps)
-            {
-                if (m.Name.ToLower() == newMap || m.Alias.ToLower() == newMap)
-                {
-                    E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(m.Alias));
-                    await Task.Delay((int)(Utilities.DefaultCommandTimeout.TotalMilliseconds / 2.0));
-                    await E.Owner.LoadMap(m.Name);
-                    return;
-                }
-            }
+            string newMap = E.Data.Trim();
+            int delay = E.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds * 1000;
 
-            // todo: this can be moved into a single statement
-            E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap));
-            await Task.Delay(5000);
-            await E.Owner.LoadMap(newMap);
+            var foundMap = E.Owner.Maps.FirstOrDefault(_map => _map.Name.Equals(newMap, StringComparison.InvariantCultureIgnoreCase) ||
+            _map.Alias.Equals(newMap, StringComparison.InvariantCultureIgnoreCase));
+
+            _ = foundMap == null ?
+                E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_UKN"].FormatExt(newMap)) :
+                 E.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(foundMap.Alias));
+
+            await Task.Delay(delay);
+            await E.Owner.LoadMap(foundMap?.Name ?? newMap);
         }
     }
 
@@ -1529,7 +1566,7 @@ namespace SharedLibraryCore.Commands
     /// </summary>
     public class SetGravatarCommand : Command
     {
-        private readonly IMetaService _metaService; 
+        private readonly IMetaService _metaService;
 
         public SetGravatarCommand(CommandConfiguration config, ITranslationLookup translationLookup, IMetaService metaService) : base(config, translationLookup)
         {

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

@@ -91,12 +91,16 @@ namespace SharedLibraryCore.Configuration
         public string[] GlobalRules { get; set; } = new string[0];
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_DISALLOWED_NAMES")]
         public string[] DisallowedClientNames { get; set; } = new string[0];
+        [LocalizedDisplayName("WEBFRONT_CONFIGURATION_MAP_CHANGE_DELAY")]
+        public int MapChangeDelaySeconds { get; set; } = 5;
         [UIHint("ServerConfiguration")]
         public ServerConfiguration[] Servers { get; set; }
 
         [ConfigurationIgnore]
         public string Id { get; set; }
         [ConfigurationIgnore]
+        public string SubscriptionId { get; set; }
+        [ConfigurationIgnore]
         public MapConfiguration[] Maps { get; set; }
         [ConfigurationIgnore]
         public QuickMessageConfiguration[] QuickMessages { get; set; }

SharedLibraryCore/Database/DatabaseContext.cs

@@ -205,7 +205,18 @@ namespace SharedLibraryCore.Database
                 pluginDir = Path.Join(Utilities.OperatingDirectory, "..", "..", "..", "..", "BUILD", "Plugins");
             }
 
-            IEnumerable<string> directoryFiles = Directory.GetFiles(pluginDir).Where(f => f.EndsWith(".dll"));
+            IEnumerable<string> directoryFiles = Enumerable.Empty<string>();
+
+            try
+            {
+                directoryFiles = Directory.GetFiles(pluginDir).Where(f => f.EndsWith(".dll"));
+            }
+
+            catch (DirectoryNotFoundException)
+            {
+                // this is just an ugly thing for unit testing
+                directoryFiles = Directory.GetFiles(@"X:\IW4MAdmin\Tests\ApplicationTests\bin\Debug\netcoreapp3.1").Where(f => f.EndsWith("dll"));
+            }
 
             foreach (string dllPath in directoryFiles)
             {

SharedLibraryCore/Events/GameEvent.cs

@@ -3,6 +3,8 @@ using SharedLibraryCore.Events;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
 
 namespace SharedLibraryCore
 {
@@ -254,9 +256,6 @@ namespace SharedLibraryCore
         public void Complete()
         {
             _eventFinishedWaiter.Set();
-#if DEBUG
-            Owner?.Logger.WriteDebug($"Completed internal for event {Id}");
-#endif
         }
 
         /// <summary>
@@ -266,11 +265,7 @@ namespace SharedLibraryCore
         public async Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token)
         {
             bool processed = false;
-
-#if DEBUG
-            Owner?.Logger.WriteDebug($"Begin wait for event {Id}");
-#endif
-
+            Utilities.DefaultLogger.LogDebug("Begin wait for event {Id}", Id);
             try
             {
                 processed = await Task.Run(() => _eventFinishedWaiter.WaitOne(timeSpan), token);
@@ -283,14 +278,12 @@ namespace SharedLibraryCore
 
             if (!processed)
             {
-                Owner?.Logger.WriteError("Waiting for event to complete timed out");
-                Owner?.Logger.WriteDebug($"{Id}, {Type}, {Data}, {Extra}, {FailReason.ToString()}, {Message}, {Origin}, {Target}");
-#if DEBUG
-                //throw new Exception();
-#endif
+                using(LogContext.PushProperty("Server", Owner?.ToString()))
+                {
+                    Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}", new { Event = this, Message, Origin = Origin.ToString(), Target = Target.ToString()});
+                }
             }
 
-
             // this lets us know if the the action timed out
             FailReason = FailReason == EventFailReason.None && !processed ? EventFailReason.Timeout : FailReason;
             return this;

SharedLibraryCore/Exceptions/RConException.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace SharedLibraryCore.Exceptions
+{
+    public class RConException : Exception
+    {
+        public RConException(string message) : base(message)
+        {
+        }
+    }
+}

SharedLibraryCore/Interfaces/ILogger.cs

@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Interfaces
 {
+    [Obsolete]
     public interface ILogger
     {
         void WriteVerbose(string msg);

SharedLibraryCore/Interfaces/IManager.cs

@@ -6,6 +6,7 @@ using SharedLibraryCore.Database.Models;
 using System.Threading;
 using System.Collections;
 using System;
+using Microsoft.Extensions.Logging;
 
 namespace SharedLibraryCore.Interfaces
 {
@@ -15,6 +16,7 @@ namespace SharedLibraryCore.Interfaces
         Task Start();
         void Stop();
         void Restart();
+        [Obsolete]
         ILogger GetLogger(long serverId);
         IList<Server> GetServers();
         IList<IManagerCommand> GetCommands();

SharedLibraryCore/Interfaces/IRConConnection.cs

@@ -17,9 +17,9 @@ namespace SharedLibraryCore.Interfaces
         Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "");
 
         /// <summary>
-        /// sets the rcon parser configuration
+        /// sets the rcon parser
         /// </summary>
-        /// <param name="config">parser config</param>
-        void SetConfiguration(IRConParserConfiguration config);
+        /// <param name="config">parser</param>
+        void SetConfiguration(IRConParser config);
     }
 }

SharedLibraryCore/Interfaces/IRConParser.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using SharedLibraryCore.Database.Models;
 using static SharedLibraryCore.Server;
@@ -82,5 +83,12 @@ namespace SharedLibraryCore.Interfaces
         /// <param name="dvarName">dvar key name</param>
         /// <returns></returns>
         T GetDefaultDvarValue<T>(string dvarName);
+
+        /// <summary>
+        /// determines the amount of time to wait for the command to respond
+        /// </summary>
+        /// <param name="command">name of command being executed</param>
+        /// <returns></returns>
+        TimeSpan OverrideTimeoutForCommand(string command);
     }
 }

SharedLibraryCore/Interfaces/IRemoteAssemblyHandler.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace SharedLibraryCore.Interfaces
+{
+    public interface IRemoteAssemblyHandler
+    {
+        IEnumerable<Assembly> DecryptAssemblies(string[] encryptedAssemblies);
+        IEnumerable<string> DecryptScripts(string[] encryptedScripts);
+    }
+}

SharedLibraryCore/PartialEntities/EFClient.cs

@@ -8,6 +8,8 @@ using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
 
 namespace SharedLibraryCore.Database.Models
 {
@@ -89,6 +91,7 @@ namespace SharedLibraryCore.Database.Models
             SetAdditionalProperty("_reportCount", 0);
             ReceivedPenalties = new List<EFPenalty>();
             _processingEvent = new SemaphoreSlim(1, 1);
+            
         }
 
         ~EFClient()
@@ -475,39 +478,42 @@ namespace SharedLibraryCore.Database.Models
         {
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
 
-            if (string.IsNullOrWhiteSpace(Name) || CleanedName.Replace(" ", "").Length < 3)
+            using (LogContext.PushProperty("Server", CurrentServer?.ToString()))
             {
-                CurrentServer.Logger.WriteDebug($"Kicking {this} because their name is too short");
-                Kick(loc["SERVER_KICK_MINNAME"], Utilities.IW4MAdminClient(CurrentServer));
-                return false;
-            }
+                if (string.IsNullOrWhiteSpace(Name) || CleanedName.Replace(" ", "").Length < 3)
+                {
+                    Utilities.DefaultLogger.LogInformation("Kicking {client} because their name is too short", ToString());
+                    Kick(loc["SERVER_KICK_MINNAME"], Utilities.IW4MAdminClient(CurrentServer));
+                    return false;
+                }
 
-            if (CurrentServer.Manager.GetApplicationSettings().Configuration()
-                .DisallowedClientNames
-                ?.Any(_name => Regex.IsMatch(Name, _name)) ?? false)
-            {
-                CurrentServer.Logger.WriteDebug($"Kicking {this} because their name is not allowed");
-                Kick(loc["SERVER_KICK_GENERICNAME"], Utilities.IW4MAdminClient(CurrentServer));
-                return false;
-            }
+                if (CurrentServer.Manager.GetApplicationSettings().Configuration()
+                    .DisallowedClientNames
+                    ?.Any(_name => Regex.IsMatch(Name, _name)) ?? false)
+                {
+                    Utilities.DefaultLogger.LogInformation("Kicking {client} because their name is not allowed", ToString());
+                    Kick(loc["SERVER_KICK_GENERICNAME"], Utilities.IW4MAdminClient(CurrentServer));
+                    return false;
+                }
 
-            if (Name.Where(c => char.IsControl(c)).Count() > 0)
-            {
-                CurrentServer.Logger.WriteDebug($"Kicking {this} because their name contains control characters");
-                Kick(loc["SERVER_KICK_CONTROLCHARS"], Utilities.IW4MAdminClient(CurrentServer));
-                return false;
-            }
+                if (Name.Where(c => char.IsControl(c)).Count() > 0)
+                {
+                    Utilities.DefaultLogger.LogInformation("Kicking {client} because their name contains control characters", ToString());
+                    Kick(loc["SERVER_KICK_CONTROLCHARS"], Utilities.IW4MAdminClient(CurrentServer));
+                    return false;
+                }
 
-            // reserved slots stuff
-            // todo: bots don't seem to honor party_maxplayers/sv_maxclients
-            if (CurrentServer.MaxClients - (CurrentServer.GetClientsAsList().Count(_client => !_client.IsPrivileged() && !_client.IsBot)) < CurrentServer.ServerConfig.ReservedSlotNumber &&
-               !this.IsPrivileged() &&
-               CurrentServer.GetClientsAsList().Count <= CurrentServer.MaxClients &&
-               CurrentServer.MaxClients != 0)
-            {
-                CurrentServer.Logger.WriteDebug($"Kicking {this} their spot is reserved");
-                Kick(loc["SERVER_KICK_SLOT_IS_RESERVED"], Utilities.IW4MAdminClient(CurrentServer));
-                return false;
+                // reserved slots stuff
+                // todo: bots don't seem to honor party_maxplayers/sv_maxclients
+                if (CurrentServer.MaxClients - (CurrentServer.GetClientsAsList().Count(_client => !_client.IsPrivileged() && !_client.IsBot)) < CurrentServer.ServerConfig.ReservedSlotNumber &&
+                !this.IsPrivileged() &&
+                CurrentServer.GetClientsAsList().Count <= CurrentServer.MaxClients &&
+                CurrentServer.MaxClients != 0)
+                {
+                    Utilities.DefaultLogger.LogInformation("Kicking {client} their spot is reserved", ToString());
+                    Kick(loc["SERVER_KICK_SLOT_IS_RESERVED"], Utilities.IW4MAdminClient(CurrentServer));
+                    return false;
+                }
             }
 
             return true;
@@ -515,126 +521,151 @@ namespace SharedLibraryCore.Database.Models
 
         public async Task OnDisconnect()
         {
-            TotalConnectionTime += ConnectionLength;
-            LastConnection = DateTime.UtcNow;
-
-            try
+            using (LogContext.PushProperty("Server", CurrentServer?.ToString()))
             {
-                await CurrentServer.Manager.GetClientService().Update(this);
-            }
+                TotalConnectionTime += ConnectionLength;
+                LastConnection = DateTime.UtcNow;
 
-            catch (Exception e)
-            {
-                CurrentServer.Logger.WriteWarning($"Could not update disconnected player {this}");
-                CurrentServer.Logger.WriteDebug(e.GetExceptionInfo());
-            }
+                Utilities.DefaultLogger.LogInformation("Client {client} is leaving the game", ToString());
 
-            finally
-            {
-                State = ClientState.Unknown;
+                try
+                {
+                    await CurrentServer.Manager.GetClientService().Update(this);
+                }
+
+                catch (Exception e)
+                {
+                        Utilities.DefaultLogger.LogError(e, "Could not update disconnected client {client}",
+                            ToString());
+                }
+
+                finally
+                {
+                    State = ClientState.Unknown;
+                }
             }
         }
 
         public async Task OnJoin(int? ipAddress)
         {
-            CurrentServer.Logger.WriteDebug($"Start join for {this}::{ipAddress}::{Level.ToString()}");
-
-            if (ipAddress != null)
+            using (LogContext.PushProperty("Server", CurrentServer?.ToString()))
             {
-                IPAddress = ipAddress;
-                await CurrentServer.Manager.GetClientService().UpdateAlias(this);
-                CurrentServer.Logger.WriteDebug($"Updated alias for {this}");
-                await CurrentServer.Manager.GetClientService().Update(this);
-                CurrentServer.Logger.WriteDebug($"Updated client for {this}");
+                Utilities.DefaultLogger.LogInformation("Client {client} is joining the game from {source}", ToString(), ipAddress.HasValue ? "Status" : "Log");
 
-                bool canConnect = await CanConnect(ipAddress);
-
-                if (!canConnect)
+                if (ipAddress != null)
                 {
-                    CurrentServer.Logger.WriteDebug($"Client {this} is not allowed to join the server");
+                    IPAddress = ipAddress;
+                    Utilities.DefaultLogger.LogInformation("Received ip from client {client}", ToString());
+                    await CurrentServer.Manager.GetClientService().UpdateAlias(this);
+                    await CurrentServer.Manager.GetClientService().Update(this);
+
+                    bool canConnect = await CanConnect(ipAddress);
+
+                    if (!canConnect)
+                    {
+                        Utilities.DefaultLogger.LogInformation("Client {client} is not allowed to join the server",
+                            ToString());
+                    }
+
+                    else
+                    {
+                        Utilities.DefaultLogger.LogDebug("Creating join event for {client}", ToString());
+                        var e = new GameEvent()
+                        {
+                            Type = GameEvent.EventType.Join,
+                            Origin = this,
+                            Target = this,
+                            Owner = CurrentServer,
+                        };
+
+                        CurrentServer.Manager.AddEvent(e);
+                    }
                 }
 
                 else
                 {
-                    CurrentServer.Logger.WriteDebug($"Creating join event for {this}");
-                    var e = new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Join,
-                        Origin = this,
-                        Target = this,
-                        Owner = CurrentServer,
-                    };
-
-                    CurrentServer.Manager.AddEvent(e);
+                    Utilities.DefaultLogger.LogInformation("Waiting to receive ip from client {client}", ToString());
                 }
-            }
 
-            else
-            {
-                CurrentServer.Logger.WriteDebug($"Client {this} does not have an IP yet");
+                Utilities.DefaultLogger.LogDebug("OnJoin finished for {client}", ToString());
             }
-
-            CurrentServer.Logger.WriteDebug($"OnJoin finished for {this}");
         }
 
         public async Task<bool> CanConnect(int? ipAddress)
         {
-            var loc = Utilities.CurrentLocalization.LocalizationIndex;
-            var autoKickClient = Utilities.IW4MAdminClient(CurrentServer);
-
-            bool isAbleToConnectSimple = IsAbleToConnectSimple();
-
-            if (!isAbleToConnectSimple)
+            using (LogContext.PushProperty("Server", CurrentServer?.ToString()))
             {
-                return false;
-            }
+                var loc = Utilities.CurrentLocalization.LocalizationIndex;
+                var autoKickClient = Utilities.IW4MAdminClient(CurrentServer);
 
-            // we want to get any penalties that are tied to their IP or AliasLink (but not necessarily their GUID)
-            var activePenalties = await CurrentServer.Manager.GetPenaltyService().GetActivePenaltiesAsync(AliasLinkId, ipAddress);
-            var banPenalty = activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.Ban);
-            var tempbanPenalty = activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.TempBan);
-            var flagPenalty = activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.Flag);
+                bool isAbleToConnectSimple = IsAbleToConnectSimple();
 
-            // we want to kick them if any account is banned
-            if (banPenalty != null)
-            {
-                if (Level == Permission.Banned)
+                if (!isAbleToConnectSimple)
                 {
-                    CurrentServer.Logger.WriteDebug($"Kicking {this} because they are banned");
-                    Kick(loc["SERVER_BAN_PREV"].FormatExt(banPenalty?.Offense), autoKickClient);
                     return false;
                 }
 
-                else
+                // we want to get any penalties that are tied to their IP or AliasLink (but not necessarily their GUID)
+                var activePenalties = await CurrentServer.Manager.GetPenaltyService()
+                    .GetActivePenaltiesAsync(AliasLinkId, ipAddress);
+                var banPenalty = activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.Ban);
+                var tempbanPenalty =
+                    activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.TempBan);
+                var flagPenalty =
+                    activePenalties.FirstOrDefault(_penalty => _penalty.Type == EFPenalty.PenaltyType.Flag);
+
+                // we want to kick them if any account is banned
+                if (banPenalty != null)
                 {
-                    CurrentServer.Logger.WriteDebug($"Client {this} is banned, but using a new GUID, we we're updating their level and kicking them");
-                    await SetLevel(Permission.Banned, autoKickClient).WaitAsync(Utilities.DefaultCommandTimeout, CurrentServer.Manager.CancellationToken);
-                    Kick(loc["SERVER_BAN_PREV"].FormatExt(banPenalty?.Offense), autoKickClient);
+                    if (Level == Permission.Banned)
+                    {
+                        Utilities.DefaultLogger.LogInformation("Kicking {client} because they are banned", ToString());
+                        Kick(loc["SERVER_BAN_PREV"].FormatExt(banPenalty?.Offense), autoKickClient);
+                        return false;
+                    }
+
+                    else
+                    {
+                        Utilities.DefaultLogger.LogInformation(
+                            "Client {client} is banned, but using a new GUID, we we're updating their level and kicking them",
+                            ToString());
+                        await SetLevel(Permission.Banned, autoKickClient).WaitAsync(Utilities.DefaultCommandTimeout,
+                            CurrentServer.Manager.CancellationToken);
+                        Kick(loc["SERVER_BAN_PREV"].FormatExt(banPenalty?.Offense), autoKickClient);
+                        return false;
+                    }
+                }
+
+                // we want to kick them if any account is tempbanned
+                if (tempbanPenalty != null)
+                {
+                    Utilities.DefaultLogger.LogInformation("Kicking {client} because their GUID is temporarily banned",
+                        ToString());
+                    Kick(
+                        $"{loc["SERVER_TB_REMAIN"]} ({(tempbanPenalty.Expires.Value - DateTime.UtcNow).HumanizeForCurrentCulture()} {loc["WEBFRONT_PENALTY_TEMPLATE_REMAINING"]})",
+                        autoKickClient);
                     return false;
                 }
-            }
 
-            // we want to kick them if any account is tempbanned
-            if (tempbanPenalty != null)
-            {
-                CurrentServer.Logger.WriteDebug($"Kicking {this} because their GUID is temporarily banned");
-                Kick($"{loc["SERVER_TB_REMAIN"]} ({(tempbanPenalty.Expires.Value - DateTime.UtcNow).HumanizeForCurrentCulture()} {loc["WEBFRONT_PENALTY_TEMPLATE_REMAINING"]})", autoKickClient);
-                return false;
-            }
+                // if we found a flag, we need to make sure all the accounts are flagged
+                if (flagPenalty != null && Level != Permission.Flagged)
+                {
+                    Utilities.DefaultLogger.LogInformation(
+                        "Flagged client {client} joining with new GUID, so we are changing their level to flagged",
+                        ToString());
+                    await SetLevel(Permission.Flagged, autoKickClient).WaitAsync(Utilities.DefaultCommandTimeout,
+                        CurrentServer.Manager.CancellationToken);
+                }
 
-            // if we found a flag, we need to make sure all the accounts are flagged
-            if (flagPenalty != null && Level != Permission.Flagged)
-            {
-                CurrentServer.Logger.WriteDebug($"Flagged client {this} joining with new GUID, so we are changing their level to flagged");
-                await SetLevel(Permission.Flagged, autoKickClient).WaitAsync(Utilities.DefaultCommandTimeout, CurrentServer.Manager.CancellationToken);
-            }
-
-            // remove their auto flag
-            if (Level == Permission.Flagged && !activePenalties.Any(_penalty => _penalty.Type == EFPenalty.PenaltyType.Flag))
-            {
-                // remove their auto flag status after a week
-                CurrentServer.Logger.WriteInfo($"Unflagging {this} because the auto flag time has expired");
-                Unflag(Utilities.CurrentLocalization.LocalizationIndex["SERVER_AUTOFLAG_UNFLAG"], autoKickClient);
+                // remove their auto flag
+                if (Level == Permission.Flagged &&
+                    !activePenalties.Any(_penalty => _penalty.Type == EFPenalty.PenaltyType.Flag))
+                {
+                    // remove their auto flag status after a week
+                    Utilities.DefaultLogger.LogInformation("Unflagging {client} because the auto flag time has expired",
+                        ToString());
+                    Unflag(Utilities.CurrentLocalization.LocalizationIndex["SERVER_AUTOFLAG_UNFLAG"], autoKickClient);
+                }
             }
 
             return true;

SharedLibraryCore/RCon/StaticHelpers.cs

@@ -49,14 +49,24 @@ namespace SharedLibraryCore.RCon
         /// <summary>
         /// timeout in seconds to wait for a socket send or receive before giving up
         /// </summary>
-        public static readonly int SocketTimeout = 10000;
+        public static TimeSpan SocketTimeout(int retryAttempt)
+        {
+            return retryAttempt switch
+            {
+                1 => TimeSpan.FromMilliseconds(550),
+                2 => TimeSpan.FromMilliseconds(1000),
+                3 => TimeSpan.FromMilliseconds(2000),
+                4 => TimeSpan.FromMilliseconds(5000),
+                _ => TimeSpan.FromMilliseconds(10000),
+            };
+        }
         /// <summary>
         /// interval in milliseconds to wait before sending the next RCon request
         /// </summary>
-        public static readonly int FloodProtectionInterval = 650;
+        public static readonly int FloodProtectionInterval = 750;
         /// <summary>
         /// how many failed connection attempts before aborting connection
         /// </summary>
-        public static readonly int AllowedConnectionFails = 3;
+        public static readonly int AllowedConnectionFails = 5;
     }
 }

SharedLibraryCore/Server.cs

@@ -3,12 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.Database.Models;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace SharedLibraryCore
 {
@@ -28,14 +30,15 @@ namespace SharedLibraryCore
             T7 = 8
         }
 
-        public Server(ServerConfiguration config, IManager mgr, IRConConnectionFactory rconConnectionFactory, IGameLogReaderFactory gameLogReaderFactory)
+        public Server(ILogger<Server> logger, SharedLibraryCore.Interfaces.ILogger deprecatedLogger, 
+            ServerConfiguration config, IManager mgr, IRConConnectionFactory rconConnectionFactory, 
+            IGameLogReaderFactory gameLogReaderFactory)
         {
             Password = config.Password;
             IP = config.IPAddress;
             Port = config.Port;
             Manager = mgr;
-            Logger = Manager.GetLogger(this.EndPoint);
-            Logger.WriteInfo(this.ToString());
+            Logger = deprecatedLogger;
             ServerConfig = config;
             RemoteConnection = rconConnectionFactory.CreateConnection(IP, Port, Password);
             EventProcessing = new SemaphoreSlim(1, 1);
@@ -47,6 +50,7 @@ namespace SharedLibraryCore
             CustomSayEnabled = Manager.GetApplicationSettings().Configuration().EnableCustomSayName;
             CustomSayName = Manager.GetApplicationSettings().Configuration().CustomSayName;
             this.gameLogReaderFactory = gameLogReaderFactory;
+            ServerLogger = logger;
             InitializeTokens();
             InitializeAutoMessages();
         }
@@ -122,10 +126,8 @@ namespace SharedLibraryCore
         /// <param name="message">Message to be sent to all players</param>
         public GameEvent Broadcast(string message, EFClient sender = null)
         {
-            string formattedMessage = string.Format(RconParser.Configuration.CommandPrefixes.Say, $"{(CustomSayEnabled && GameName == Game.IW4 ? $"{CustomSayName}: " : "")}{message.FixIW4ForwardSlash()}");
-#if DEBUG == true
-            Logger.WriteVerbose(message.StripColors());
-#endif
+            string formattedMessage = string.Format(RconParser.Configuration.CommandPrefixes.Say ?? "", $"{(CustomSayEnabled && GameName == Game.IW4 ? $"{CustomSayName}: " : "")}{message.FixIW4ForwardSlash()}");
+            ServerLogger.LogDebug("All->" + message.StripColors());
 
             var e = new GameEvent()
             {
@@ -146,18 +148,27 @@ namespace SharedLibraryCore
         /// <param name="target">EFClient to send message to</param>
         protected async Task Tell(string message, EFClient target)
         {
-#if !DEBUG
-            string formattedMessage = string.Format(RconParser.Configuration.CommandPrefixes.Tell, target.ClientNumber, $"{(CustomSayEnabled && GameName == Game.IW4 ? $"{CustomSayName}: " : "")}{message.FixIW4ForwardSlash()}");
-            if (target.ClientNumber > -1 && message.Length > 0 && target.Level != EFClient.Permission.Console)
-                await this.ExecuteCommandAsync(formattedMessage);
-#else
-            Logger.WriteVerbose($"{target.ClientNumber}->{message.StripColors()}");
-            await Task.CompletedTask;
-#endif
+            if (!Utilities.IsDevelopment)
+            {
+                var formattedMessage = string.Format(RconParser.Configuration.CommandPrefixes.Tell,
+                    target.ClientNumber,
+                    $"{(CustomSayEnabled && GameName == Game.IW4 ? $"{CustomSayName}: " : "")}{message.FixIW4ForwardSlash()}");
+                if (target.ClientNumber > -1 && message.Length > 0 && target.Level != EFClient.Permission.Console)
+                    await this.ExecuteCommandAsync(formattedMessage);
+            }
+            else
+            {
+                ServerLogger.LogDebug("Tell[{clientNumber}]->{message}", target.ClientNumber, message.StripColors());
+            }
+
 
             if (target.Level == EFClient.Permission.Console)
             {
                 Console.ForegroundColor = ConsoleColor.Green;
+                using (LogContext.PushProperty("Server", ToString()))
+                {
+                    ServerLogger.LogInformation("Command output received: {message}", message);
+                }
                 Console.WriteLine(message.StripColors());
                 Console.ForegroundColor = ConsoleColor.Gray;
             }
@@ -269,7 +280,7 @@ namespace SharedLibraryCore
         {
             try
             {
-                return (await this.GetDvarAsync<string>("sv_customcallbacks")).Value == "1";
+                return (await this.GetDvarAsync("sv_customcallbacks", "0")).Value == "1";
             }
 
             catch (Exceptions.DvarException)
@@ -280,7 +291,8 @@ namespace SharedLibraryCore
 
         // Objects
         public IManager Manager { get; protected set; }
-        public ILogger Logger { get; private set; }
+        [Obsolete]
+        public SharedLibraryCore.Interfaces.ILogger Logger { get; private set; }
         public ServerConfiguration ServerConfig { get; private set; }
         public List<Map> Maps { get; protected set; } = new List<Map>();
         public List<Report> Reports { get; set; }
@@ -319,6 +331,7 @@ namespace SharedLibraryCore
         public string IP { get; protected set; }
         public string Version { get; protected set; }
         public bool IsInitialized { get; set; }
+        protected readonly ILogger ServerLogger;
 
         public int Port { get; private set; }
         protected string FSGame;

SharedLibraryCore/Services/ChangeHistoryService.cs

@@ -5,11 +5,20 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace SharedLibraryCore.Services
 {
     public class ChangeHistoryService : IEntityService<EFChangeHistory>
     {
+        private readonly ILogger _logger;
+        
+        public ChangeHistoryService(ILogger<ChangeHistoryService> logger)
+        {
+            _logger = logger;
+        }
+        
         public Task<EFChangeHistory> Create(EFChangeHistory entity)
         {
             throw new NotImplementedException();
@@ -79,8 +88,7 @@ namespace SharedLibraryCore.Services
 
                 catch (Exception ex)
                 {
-                    e.Owner.Logger.WriteWarning(ex.Message);
-                    e.Owner.Logger.WriteDebug(ex.GetExceptionInfo());
+                    _logger.LogError(ex, "Could not persist change @{change}", change);
                 }
 
                 finally

SharedLibraryCore/Services/ClientService.cs

@@ -8,22 +8,28 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace SharedLibraryCore.Services
 {
     public class ClientService : IEntityService<EFClient>, IResourceQueryHelper<FindClientRequest, FindClientResult>
     {
         private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ILogger _logger;
 
-        public ClientService(IDatabaseContextFactory databaseContextFactory)
+        public ClientService(ILogger<ClientService> logger, IDatabaseContextFactory databaseContextFactory)
         {
             _contextFactory = databaseContextFactory;
+            _logger = logger;
         }
 
         public async Task<EFClient> Create(EFClient entity)
         {
             using (var context = new DatabaseContext())
+            using (LogContext.PushProperty("Server", entity?.CurrentServer?.ToString()))
             {
                 int? linkId = null;
                 int? aliasId = null;
@@ -40,13 +46,13 @@ namespace SharedLibraryCore.Services
                     {
                         linkId = existingAliases.OrderBy(_alias => _alias.LinkId).First().LinkId;
 
-                        entity.CurrentServer.Logger.WriteDebug($"[create] client with new GUID {entity} has existing link {linkId}");
+                        _logger.LogDebug("[create] client with new GUID {entity} has existing link {linkId}", entity.ToString(), linkId);
 
                         var existingExactAlias = existingAliases.FirstOrDefault(_alias => _alias.Name == entity.Name);
 
                         if (existingExactAlias != null)
                         {
-                            entity.CurrentServer.Logger.WriteDebug($"[create] client with new GUID {entity} has existing alias {existingExactAlias.AliasId}");
+                            _logger.LogDebug("[create] client with new GUID {entity} has existing alias {aliasId}", entity.ToString(), existingExactAlias.AliasId);
                             aliasId = existingExactAlias.AliasId;
                         }
                     }
@@ -60,13 +66,13 @@ namespace SharedLibraryCore.Services
                     NetworkId = entity.NetworkId
                 };
 
-                entity.CurrentServer.Logger.WriteDebug($"[create] adding {entity} to context");
+                _logger.LogDebug("[create] adding {entity} to context", entity.ToString());
                 context.Clients.Add(client);
 
                 // they're just using a new GUID
                 if (aliasId.HasValue)
                 {
-                    entity.CurrentServer.Logger.WriteDebug($"[create] setting {entity}'s alias id and linkid to ({aliasId.Value}, {linkId.Value})");
+                    _logger.LogDebug("[create] setting {entity}'s alias id and linkid to ({aliasId}, {linkId})", entity.ToString(), aliasId, linkId);
                     client.CurrentAliasId = aliasId.Value;
                     client.AliasLinkId = linkId.Value;
                 }
@@ -74,7 +80,7 @@ namespace SharedLibraryCore.Services
                 // link was found but they don't have an exact alias
                 else if (!aliasId.HasValue && linkId.HasValue)
                 {
-                    entity.CurrentServer.Logger.WriteDebug($"[create] setting {entity}'s linkid to {linkId.Value}, but creating new alias");
+                    _logger.LogDebug("[create] setting {entity}'s linkid to {linkId}, but creating new alias", entity.ToString(), linkId);
                     client.AliasLinkId = linkId.Value;
                     client.CurrentAlias = new EFAlias()
                     {
@@ -89,7 +95,7 @@ namespace SharedLibraryCore.Services
                 // brand new players (supposedly)
                 else
                 {
-                    entity.CurrentServer.Logger.WriteDebug($"[create] creating new Link and Alias for {entity}");
+                    _logger.LogDebug("[create] creating new Link and Alias for {entity}", entity.ToString());
                     var link = new EFAliasLink();
                     var alias = new EFAlias()
                     {
@@ -114,129 +120,139 @@ namespace SharedLibraryCore.Services
 
         private async Task UpdateAlias(string originalName, int? ip, EFClient entity, DatabaseContext context)
         {
-            string name = originalName.CapClientName(EFAlias.MAX_NAME_LENGTH);
-
-            // entity is the tracked db context item
-            // get all aliases by IP address and LinkId
-            var iqAliases = context.Aliases
-                .Include(a => a.Link)
-                // we only want alias that have the same IP address or share a link
-                .Where(_alias => _alias.IPAddress == ip || (_alias.LinkId == entity.AliasLinkId));
-
-            var aliases = await iqAliases.ToListAsync();
-            var currentIPs = aliases.Where(_a2 => _a2.IPAddress != null).Select(_a2 => _a2.IPAddress).Distinct();
-            var floatingIPAliases = await context.Aliases.Where(_alias => currentIPs.Contains(_alias.IPAddress)).ToListAsync();
-            aliases.AddRange(floatingIPAliases);
-
-            // see if they have a matching IP + Name but new NetworkId
-            var existingExactAlias = aliases.OrderBy(_alias => _alias.LinkId).FirstOrDefault(a => a.Name == name && a.IPAddress == ip);
-            bool hasExactAliasMatch = existingExactAlias != null;
-
-            // if existing alias matches link them
-            var newAliasLink = existingExactAlias?.Link;
-            // if no exact matches find the first IP or LinkId that matches
-            newAliasLink = newAliasLink ?? aliases.OrderBy(_alias => _alias.LinkId).FirstOrDefault()?.Link;
-            // if no matches are found, use our current one ( it will become permanent )
-            newAliasLink = newAliasLink ?? entity.AliasLink;
-
-            bool hasExistingAlias = aliases.Count > 0;
-            bool isAliasLinkUpdated = newAliasLink.AliasLinkId != entity.AliasLink.AliasLinkId;
-
-            await context.SaveChangesAsync();
-            int distinctLinkCount = aliases.Select(_alias => _alias.LinkId).Distinct().Count();
-            // this happens when the link we found is different than the one we create before adding an IP
-            if (isAliasLinkUpdated || distinctLinkCount > 1)
+            using (LogContext.PushProperty("Server", entity?.CurrentServer?.ToString()))
             {
-                entity.CurrentServer.Logger.WriteDebug($"[updatealias] found a link for {entity} so we are updating link from {entity.AliasLink.AliasLinkId} to {newAliasLink.AliasLinkId}");
+                string name = originalName.CapClientName(EFAlias.MAX_NAME_LENGTH);
 
-                var completeAliasLinkIds = aliases.Select(_item => _item.LinkId)
-                    .Append(entity.AliasLinkId)
-                    .Distinct()
-                    .ToList();
+                // entity is the tracked db context item
+                // get all aliases by IP address and LinkId
+                var iqAliases = context.Aliases
+                    .Include(a => a.Link)
+                    // we only want alias that have the same IP address or share a link
+                    .Where(_alias => _alias.IPAddress == ip || (_alias.LinkId == entity.AliasLinkId));
 
-                entity.CurrentServer.Logger.WriteDebug($"[updatealias] updating aliasLinks {string.Join(',', completeAliasLinkIds)} for IP {ip} to {newAliasLink.AliasLinkId}");
+                var aliases = await iqAliases.ToListAsync();
+                var currentIPs = aliases.Where(_a2 => _a2.IPAddress != null).Select(_a2 => _a2.IPAddress).Distinct();
+                var floatingIPAliases = await context.Aliases.Where(_alias => currentIPs.Contains(_alias.IPAddress))
+                    .ToListAsync();
+                aliases.AddRange(floatingIPAliases);
 
-                // update all the clients that have the old alias link
-                await context.Clients
-                    .Where(_client => completeAliasLinkIds.Contains(_client.AliasLinkId))
-                    .ForEachAsync(_client => _client.AliasLinkId = newAliasLink.AliasLinkId);
+                // see if they have a matching IP + Name but new NetworkId
+                var existingExactAlias = aliases.OrderBy(_alias => _alias.LinkId)
+                    .FirstOrDefault(a => a.Name == name && a.IPAddress == ip);
+                bool hasExactAliasMatch = existingExactAlias != null;
 
-                // we also need to update all the penalties or they get deleted
-                // scenario
-                // link1 joins with ip1
-                // link2 joins with ip2,
-                // link2 receives penalty
-                // link2 joins with ip1
-                // pre existing link for link2 detected
-                // link2 is deleted
-                // link2 penalties are orphaned
-                await context.Penalties
-                    .Where(_penalty => completeAliasLinkIds.Contains(_penalty.LinkId))
-                    .ForEachAsync(_penalty => _penalty.LinkId = newAliasLink.AliasLinkId);
+                // if existing alias matches link them
+                var newAliasLink = existingExactAlias?.Link;
+                // if no exact matches find the first IP or LinkId that matches
+                newAliasLink = newAliasLink ?? aliases.OrderBy(_alias => _alias.LinkId).FirstOrDefault()?.Link;
+                // if no matches are found, use our current one ( it will become permanent )
+                newAliasLink = newAliasLink ?? entity.AliasLink;
 
-                entity.AliasLink = newAliasLink;
-                entity.AliasLinkId = newAliasLink.AliasLinkId;
-
-                // update all previous aliases
-                await context.Aliases
-                    .Where(_alias => completeAliasLinkIds.Contains(_alias.LinkId))
-                    .ForEachAsync(_alias => _alias.LinkId = newAliasLink.AliasLinkId);
+                bool hasExistingAlias = aliases.Count > 0;
+                bool isAliasLinkUpdated = newAliasLink.AliasLinkId != entity.AliasLink.AliasLinkId;
 
                 await context.SaveChangesAsync();
-                // we want to delete the now inactive alias
-                if (newAliasLink.AliasLinkId != entity.AliasLinkId)
+                int distinctLinkCount = aliases.Select(_alias => _alias.LinkId).Distinct().Count();
+                // this happens when the link we found is different than the one we create before adding an IP
+                if (isAliasLinkUpdated || distinctLinkCount > 1)
                 {
-                    context.AliasLinks.Remove(entity.AliasLink);
-                    await context.SaveChangesAsync();
-                }
-            }
+                    _logger.LogDebug(
+                        "[updatealias] found a link for {entity} so we are updating link from {oldAliasLinkId} to {newAliasLinkId}",
+                        entity.ToString(), entity.AliasLink.AliasLinkId, newAliasLink.AliasLinkId);
 
-            // the existing alias matches ip and name, so we can just ignore the temporary one
-            if (hasExactAliasMatch)
-            {
-                entity.CurrentServer.Logger.WriteDebug($"[updatealias] {entity} has exact alias match");
+                    var completeAliasLinkIds = aliases.Select(_item => _item.LinkId)
+                        .Append(entity.AliasLinkId)
+                        .Distinct()
+                        .ToList();
 
-                var oldAlias = entity.CurrentAlias;
-                entity.CurrentAliasId = existingExactAlias.AliasId;
-                entity.CurrentAlias = existingExactAlias;
-                await context.SaveChangesAsync();
+                    _logger.LogDebug("[updatealias] updating aliasLinks {links} for IP {ip} to {linkId}",
+                        string.Join(',', completeAliasLinkIds), ip, newAliasLink.AliasLinkId);
 
-                // the alias is the same so we can just remove it 
-                if (oldAlias.AliasId != existingExactAlias.AliasId && oldAlias.AliasId > 0)
-                {
+                    // update all the clients that have the old alias link
                     await context.Clients
-                        .Where(_client => _client.CurrentAliasId == oldAlias.AliasId)
-                        .ForEachAsync(_client => _client.CurrentAliasId = existingExactAlias.AliasId);
+                        .Where(_client => completeAliasLinkIds.Contains(_client.AliasLinkId))
+                        .ForEachAsync(_client => _client.AliasLinkId = newAliasLink.AliasLinkId);
+
+                    // we also need to update all the penalties or they get deleted
+                    // scenario
+                    // link1 joins with ip1
+                    // link2 joins with ip2,
+                    // link2 receives penalty
+                    // link2 joins with ip1
+                    // pre existing link for link2 detected
+                    // link2 is deleted
+                    // link2 penalties are orphaned
+                    await context.Penalties
+                        .Where(_penalty => completeAliasLinkIds.Contains(_penalty.LinkId))
+                        .ForEachAsync(_penalty => _penalty.LinkId = newAliasLink.AliasLinkId);
+
+                    entity.AliasLink = newAliasLink;
+                    entity.AliasLinkId = newAliasLink.AliasLinkId;
+
+                    // update all previous aliases
+                    await context.Aliases
+                        .Where(_alias => completeAliasLinkIds.Contains(_alias.LinkId))
+                        .ForEachAsync(_alias => _alias.LinkId = newAliasLink.AliasLinkId);
 
                     await context.SaveChangesAsync();
-
-                    if (context.Entry(oldAlias).State != EntityState.Deleted)
+                    // we want to delete the now inactive alias
+                    if (newAliasLink.AliasLinkId != entity.AliasLinkId)
                     {
-                        entity.CurrentServer.Logger.WriteDebug($"[updatealias] {entity} has exact alias match, so we're going to try to remove aliasId {oldAlias.AliasId} with linkId {oldAlias.AliasId}");
-                        context.Aliases.Remove(oldAlias);
+                        context.AliasLinks.Remove(entity.AliasLink);
                         await context.SaveChangesAsync();
                     }
                 }
-            }
 
-            // theres no exact match, but they've played before with the GUID or IP
-            else
-            {
-                entity.CurrentServer.Logger.WriteDebug($"[updatealias] {entity} is using a new alias");
-
-                var newAlias = new EFAlias()
+                // the existing alias matches ip and name, so we can just ignore the temporary one
+                if (hasExactAliasMatch)
                 {
-                    DateAdded = DateTime.UtcNow,
-                    IPAddress = ip,
-                    LinkId = newAliasLink.AliasLinkId,
-                    Name = name,
-                    SearchableName = name.StripColors().ToLower(),
-                    Active = true,
-                };
+                    _logger.LogDebug("[updatealias] {entity} has exact alias match", entity.ToString());
 
-                entity.CurrentAlias = newAlias;
-                entity.CurrentAliasId = 0;
-                await context.SaveChangesAsync();
+                    var oldAlias = entity.CurrentAlias;
+                    entity.CurrentAliasId = existingExactAlias.AliasId;
+                    entity.CurrentAlias = existingExactAlias;
+                    await context.SaveChangesAsync();
+
+                    // the alias is the same so we can just remove it 
+                    if (oldAlias.AliasId != existingExactAlias.AliasId && oldAlias.AliasId > 0)
+                    {
+                        await context.Clients
+                            .Where(_client => _client.CurrentAliasId == oldAlias.AliasId)
+                            .ForEachAsync(_client => _client.CurrentAliasId = existingExactAlias.AliasId);
+
+                        await context.SaveChangesAsync();
+
+                        if (context.Entry(oldAlias).State != EntityState.Deleted)
+                        {
+                            _logger.LogDebug(
+                                "[updatealias] {entity} has exact alias match, so we're going to try to remove aliasId {aliasId} with linkId {linkId}",
+                                entity.ToString(), oldAlias.AliasId, oldAlias.LinkId);
+                            context.Aliases.Remove(oldAlias);
+                            await context.SaveChangesAsync();
+                        }
+                    }
+                }
+
+                // theres no exact match, but they've played before with the GUID or IP
+                else
+                {
+                    _logger.LogDebug("[updatealias] {entity} is using a new alias", entity.ToString());
+
+                    var newAlias = new EFAlias()
+                    {
+                        DateAdded = DateTime.UtcNow,
+                        IPAddress = ip,
+                        LinkId = newAliasLink.AliasLinkId,
+                        Name = name,
+                        SearchableName = name.StripColors().ToLower(),
+                        Active = true,
+                    };
+
+                    entity.CurrentAlias = newAlias;
+                    entity.CurrentAliasId = 0;
+                    await context.SaveChangesAsync();
+                }
             }
         }
 
@@ -261,29 +277,29 @@ namespace SharedLibraryCore.Services
                 entity.Level = newPermission;
                 await ctx.SaveChangesAsync();
 
-#if DEBUG == true
-                temporalClient.CurrentServer.Logger.WriteDebug($"Updated {temporalClient.ClientId} to {newPermission}");
-#endif
-
-                var linkedPermissionSet = new[] { Permission.Banned, Permission.Flagged };
-                // if their permission level has been changed to level that needs to be updated on all accounts
-                if (linkedPermissionSet.Contains(newPermission) || linkedPermissionSet.Contains(oldPermission))
+                using (LogContext.PushProperty("Server", entity?.CurrentServer?.ToString()))
                 {
-                    //get all clients that have the same linkId
-                    var iqMatchingClients = ctx.Clients
-                        .Where(_client => _client.AliasLinkId == entity.AliasLinkId);
+                    _logger.LogInformation("Updated {clientId} to {newPermission}", temporalClient.ClientId, newPermission);
 
-                    // this updates the level for all the clients with the same LinkId
-                    // only if their new level is flagged or banned
-                    await iqMatchingClients.ForEachAsync(_client =>
+                    var linkedPermissionSet = new[] {Permission.Banned, Permission.Flagged};
+                    // if their permission level has been changed to level that needs to be updated on all accounts
+                    if (linkedPermissionSet.Contains(newPermission) || linkedPermissionSet.Contains(oldPermission))
                     {
-                        _client.Level = newPermission;
-#if DEBUG == true
-                        temporalClient.CurrentServer.Logger.WriteDebug($"Updated linked {_client.ClientId} to {newPermission}");
-#endif
-                    });
+                        //get all clients that have the same linkId
+                        var iqMatchingClients = ctx.Clients
+                            .Where(_client => _client.AliasLinkId == entity.AliasLinkId);
 
-                    await ctx.SaveChangesAsync();
+                        // this updates the level for all the clients with the same LinkId
+                        // only if their new level is flagged or banned
+                        await iqMatchingClients.ForEachAsync(_client =>
+                        {
+                            _client.Level = newPermission;
+                            _logger.LogInformation("Updated linked {clientId} to {newPermission}", _client.ClientId,
+                                newPermission);
+                        });
+
+                        await ctx.SaveChangesAsync();
+                    }
                 }
             }
 
@@ -432,7 +448,7 @@ namespace SharedLibraryCore.Services
         {
             if (temporalClient.ClientId < 1)
             {
-                temporalClient.CurrentServer?.Logger.WriteDebug($"[update] {temporalClient} needs to be updated but they do not have a valid client id, ignoring..");
+                _logger.LogDebug("[update] {client} needs to be updated but they do not have a valid client id, ignoring..", temporalClient.ToString());
                 // note: we never do anything with the result of this so we can safely return null
                 return null;
             }

SharedLibraryCore/SharedLibraryCore.csproj

@@ -3,8 +3,6 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <ApplicationIcon />
-    <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.SharedLibraryCore</PackageId>
     <Version>2.4.10</Version>
     <Authors>RaidMax</Authors>
@@ -21,8 +19,9 @@
     <IsPackable>true</IsPackable>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Description>Shared Library for IW4MAdmin</Description>
-    <AssemblyVersion>2.4.10.0</AssemblyVersion>
-    <FileVersion>2.4.10.0</FileVersion>
+    <AssemblyVersion>2020.11.11.1</AssemblyVersion>
+    <FileVersion>2020.11.11.1</FileVersion>
+    <PackageVersion>2020.11.11.1</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prerelease|AnyCPU'">
@@ -54,6 +53,7 @@
     <PackageReference Include="Npgsql" Version="4.1.4" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="SimpleCrypto.NetCore" Version="1.0.0" />
   </ItemGroup>
 

SharedLibraryCore/Utilities.cs

@@ -17,14 +17,18 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Database.Models.EFClient;
 using static SharedLibraryCore.Database.Models.EFPenalty;
 using static SharedLibraryCore.Server;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace SharedLibraryCore
 {
     public static class Utilities
     {
+        // note: this is only to be used by classes not created by dependency injection
+        public static ILogger DefaultLogger { get; set; }
 #if DEBUG == true
         public static string OperatingDirectory => $"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}{Path.DirectorySeparatorChar}";
 #else
@@ -881,8 +885,7 @@ namespace SharedLibraryCore
 
             catch (Exception e)
             {
-                logger.WriteWarning($"Could not create penalty of type {penalty.Type.ToString()}");
-                logger.WriteDebug(e.GetExceptionInfo());
+                logger.LogError(e, $"Could not create penalty of type {penalty.Type.ToString()}");
             }
 
             return false;

Tests/ApplicationTests/ApplicationTests.csproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="6.2.0" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">

Tests/ApplicationTests/BaseEventParserTests.cs

@@ -10,6 +10,7 @@ using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using System;
 using static SharedLibraryCore.GameEvent;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
@@ -18,7 +19,6 @@ namespace ApplicationTests
     {
         private EventLogTest eventLogData;
         private IServiceProvider serviceProvider;
-        private ILogger fakeLogger;
         private ApplicationConfiguration appConfig;
 
         [SetUp]
@@ -27,13 +27,12 @@ namespace ApplicationTests
             eventLogData = JsonConvert.DeserializeObject<EventLogTest>(System.IO.File.ReadAllText("Files/GameEvents.json"));
             appConfig = ConfigurationGenerators.CreateApplicationConfiguration();
 
-            fakeLogger = A.Fake<ILogger>();
             serviceProvider = new ServiceCollection()
+                .AddSingleton(A.Fake<ILogger>())
                 .AddSingleton<BaseEventParser>()
                 .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
                 .AddSingleton<IParserRegexFactory, ParserRegexFactory>()
                 .AddSingleton(appConfig)
-                .AddSingleton(fakeLogger)
                 .BuildServiceProvider();
         }
 
@@ -86,18 +85,6 @@ namespace ApplicationTests
             });
         }
 
-        [Test]
-        public void TestCustomEventParsingLogsWarningOnException()
-        {
-            var eventParser = serviceProvider.GetService<BaseEventParser>();
-
-            eventParser.RegisterCustomEvent("test", "test", (a, b, c) => throw new Exception());
-            eventParser.GenerateGameEvent("12:12 test");
-
-            A.CallTo(() => fakeLogger.WriteWarning(A<string>.Ignored))
-                .MustHaveHappenedOnceExactly();
-        }
-
         [Test]
         public void Test_CustomCommandPrefix_Parses()
         {

Tests/ApplicationTests/BaseRConParserTests.cs

@@ -1,5 +1,6 @@
 using FakeItEasy;
 using IW4MAdmin.Application.RconParsers;
+using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using SharedLibraryCore.Interfaces;
 
@@ -8,10 +9,12 @@ namespace ApplicationTests
     [TestFixture]
     public class BaseRConParserTests
     {
+        private readonly ILogger<BaseRConParser> _fakeLogger = A.Fake<ILogger<BaseRConParser>>();
+        
         [Test]
         public void SetDvarAsync_FormatStringType()
         {
-            var parser = new BaseRConParser(A.Fake<IParserRegexFactory>());
+            var parser = new BaseRConParser(_fakeLogger, A.Fake<IParserRegexFactory>());
             var connection = A.Fake<IRConConnection>();
 
             parser.SetDvarAsync(connection, "test", "test").Wait();
@@ -23,7 +26,7 @@ namespace ApplicationTests
         [Test]
         public void SetDvarAsync_FormatEmptyStringTypeIncludesQuotes()
         {
-            var parser = new BaseRConParser(A.Fake<IParserRegexFactory>());
+            var parser = new BaseRConParser(_fakeLogger, A.Fake<IParserRegexFactory>());
             var connection = A.Fake<IRConConnection>();
 
             parser.SetDvarAsync(connection, "test", "").Wait();
@@ -35,7 +38,7 @@ namespace ApplicationTests
         [Test]
         public void SetDvarAsync_FormatsNonString()
         {
-            var parser = new BaseRConParser(A.Fake<IParserRegexFactory>());
+            var parser = new BaseRConParser(_fakeLogger, A.Fake<IParserRegexFactory>());
             var connection = A.Fake<IRConConnection>();
 
             parser.SetDvarAsync(connection, "test", 123).Wait();

Tests/ApplicationTests/ClientTests.cs

@@ -8,6 +8,7 @@ using SharedLibraryCore.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using SharedLibraryCore.Configuration;
 
 namespace ApplicationTests
 {

Tests/ApplicationTests/CommandTests.cs

@@ -14,13 +14,15 @@ using SharedLibraryCore;
 using ApplicationTests.Mocks;
 using SharedLibraryCore.Services;
 using static SharedLibraryCore.Database.Models.EFClient;
+using FluentAssertions;
+using FluentAssertions.Extensions;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
     [TestFixture]
     public class CommandTests
     {
-        ILogger logger;
         private IServiceProvider serviceProvider;
         private ITranslationLookup transLookup;
         private CommandConfiguration cmdConfig;
@@ -32,12 +34,13 @@ namespace ApplicationTests
         [SetUp]
         public void Setup()
         {
-            logger = A.Fake<ILogger>();
-            cmdConfig = new CommandConfiguration();
-
             serviceProvider = new ServiceCollection()
                 .BuildBase(new EventHandlerMock(true))
                 .AddSingleton(A.Fake<ClientService>())
+                .AddSingleton<LoadMapCommand>()
+                .AddSingleton<SetLevelCommand>()
+                .AddSingleton<RunAsCommand>()
+                .AddSingleton<PrivateMessageAdminsCommand>()
                 .BuildServiceProvider()
                 .SetupTestHooks();
 
@@ -46,6 +49,12 @@ namespace ApplicationTests
             transLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
             clientService = serviceProvider.GetRequiredService<ClientService>();
             appConfig = serviceProvider.GetRequiredService<ApplicationConfiguration>();
+            appConfig.MapChangeDelaySeconds = 1;
+            cmdConfig = serviceProvider.GetRequiredService<CommandConfiguration>();
+            serviceProvider.GetService<IW4MServer>().RconParser =
+                serviceProvider.GetService<IRConParser>();
+
+            Utilities.DefaultLogger = serviceProvider.GetRequiredService<ILogger>();
 
             A.CallTo(() => manager.GetClientService())
                 .Returns(clientService);
@@ -69,7 +78,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnSelf()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
 
@@ -88,7 +97,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnHigherPrivilege()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Administrator;
@@ -111,7 +120,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnSamePrivilege()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Administrator;
@@ -134,7 +143,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsFailsOnDisallowedCommand()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Moderator;
@@ -160,7 +169,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_RunAsQueuesEventAndResponse()
         {
-            var cmd = new RunAsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<RunAsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = EFClient.Permission.Moderator;
@@ -187,7 +196,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_SetLevelFailOnSelf()
         {
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = Permission.Owner;
@@ -211,7 +220,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithSourcePrivilegeTooLow()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Moderator;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -239,7 +248,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithExistingOwner_AndOnlyOneOwnerAllowed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             var target = ClientGenerators.CreateBasicClient(server);
             target.Level = Permission.User;
@@ -266,7 +275,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithStepPrivilegesDisabled_AndNonOwner()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.SeniorAdmin;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -294,7 +303,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailWithStepPrivilegesEnabled_ButNewPermissionTooHigh()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Moderator;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -320,7 +329,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelFailInvalidGroup()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -345,7 +354,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceedWithNoExistingOwner_AndOnlyOneOwnerAllowed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -373,7 +382,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelOwnerSucceedWithMultiOwnerAllowed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -402,7 +411,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelOwnerSucceedWithMultiOwnerAllowed_AndSteppedPrivileges()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -432,7 +441,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceedWithSteppedPrivileges()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Moderator;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -461,7 +470,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceed()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var target = ClientGenerators.CreateBasicClient(server);
@@ -490,7 +499,7 @@ namespace ApplicationTests
         public async Task Test_SetLevelSucceed_AndFindsIngameClient()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var cmd = new SetLevelCommand(cmdConfig, transLookup, logger);
+            var cmd = serviceProvider.GetRequiredService<SetLevelCommand>();
             var origin = ClientGenerators.CreateBasicClient(server);
             origin.Level = Permission.Owner;
             var databaseTarget = ClientGenerators.CreateDatabaseClient();
@@ -542,14 +551,14 @@ namespace ApplicationTests
         [Test]
         public async Task Test_PrivateMessageAdmins_HappyPath()
         {
-            var cmd = new PrivateMessageAdminsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<PrivateMessageAdminsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var origin = ClientGenerators.CreateDatabaseClient();
             origin.Level = Permission.Administrator;
             origin.CurrentServer = server;
             var gameEvent = EventGenerators.GenerateEvent(GameEvent.EventType.Command, "", server);
             cmdConfig.Commands.Add(nameof(PrivateMessageAdminsCommand), new CommandProperties { SupportedGames = new[] { server.GameName } });
-            
+
             server.Clients[0] = origin;
             server.Clients[1] = origin;
             await cmd.ExecuteAsync(gameEvent);
@@ -561,7 +570,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_PrivateMessageAdmins_GameNotSupported()
         {
-            var cmd = new PrivateMessageAdminsCommand(cmdConfig, transLookup);
+            var cmd = serviceProvider.GetRequiredService<PrivateMessageAdminsCommand>();
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             var origin = ClientGenerators.CreateDatabaseClient();
             origin.Level = Permission.Administrator;
@@ -578,5 +587,46 @@ namespace ApplicationTests
             Assert.AreEqual(expectedEvents, mockEventHandler.Events.Count(_event => _event.Type == GameEvent.EventType.Tell));
         }
         #endregion
+
+        #region LOADMAP
+        [Test]
+        public void Test_LoadMap_WaitsAppropriateTime_BeforeExecutingCommand()
+        {
+            var cmd = serviceProvider.GetRequiredService<LoadMapCommand>();
+            var server = serviceProvider.GetRequiredService<IW4MServer>();
+            var rconParser = serviceProvider.GetRequiredService<IRConParser>();
+            server.Maps.Add(new Map()
+            {
+                Name = "mp_test",
+                Alias = "test"
+            });
+            var gameEvent = EventGenerators.GenerateEvent(GameEvent.EventType.Command, server.Maps.First().Name, server);
+
+            Func<Task> act = () => cmd.ExecuteAsync(gameEvent);
+
+            act.ExecutionTime().Should().BeCloseTo(appConfig.MapChangeDelaySeconds.Seconds(), 500.Milliseconds());
+            A.CallTo(() => rconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, A<string>.Ignored))
+                .MustHaveHappened();
+        }
+
+        [Test]
+        public async Task Test_LoadMap_FindsMapName_FromPartialAlias()
+        {
+            var cmd = serviceProvider.GetRequiredService<LoadMapCommand>();
+            var server = serviceProvider.GetRequiredService<IW4MServer>();
+            var rconParser = serviceProvider.GetRequiredService<IRConParser>();
+            server.Maps.Add(new Map()
+            {
+                Name = "mp_test",
+                Alias = "test"
+            });
+            var gameEvent = EventGenerators.GenerateEvent(GameEvent.EventType.Command, server.Maps.First().Name, server);
+
+            await cmd.ExecuteAsync(gameEvent);
+
+            A.CallTo(() => rconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, A<string>.That.Contains(server.Maps[0].Name)))
+                .MustHaveHappened();
+        }
+        #endregion
     }
 }

Tests/ApplicationTests/DependencyInjectionExtensions.cs

@@ -4,10 +4,9 @@ using FakeItEasy;
 using IW4MAdmin;
 using Microsoft.Extensions.DependencyInjection;
 using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Services;
 using System;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
@@ -28,17 +27,22 @@ namespace ApplicationTests
             }
 
             var manager = A.Fake<IManager>();
-            var logger = A.Fake<ILogger>();
 
-            A.CallTo(() => manager.GetLogger(A<long>.Ignored))
-                .Returns(logger);
+            var transLookup = A.Fake<ITranslationLookup>();
+            A.CallTo(() => transLookup[A<string>.Ignored])
+                .Returns("test");
 
-            serviceCollection.AddSingleton(logger)
+            serviceCollection
+                .AddLogging()
+                .AddSingleton(A.Fake<ILogger>())
+                .AddSingleton(A.Fake<SharedLibraryCore.Interfaces.ILogger>())
+                .AddSingleton(new ServerConfiguration { IPAddress = "127.0.0.1", Port = 28960 })
                 .AddSingleton(manager)
                 .AddSingleton<IDatabaseContextFactory, DatabaseContextFactoryMock>()
+                .AddSingleton<IW4MServer>()
                 .AddSingleton(A.Fake<IRConConnectionFactory>())
                 .AddSingleton(A.Fake<IRConConnection>())
-                .AddSingleton(A.Fake<ITranslationLookup>())
+                .AddSingleton(transLookup)
                 .AddSingleton(A.Fake<IRConParser>())
                 .AddSingleton(A.Fake<IParserRegexFactory>())
                 .AddSingleton<DataFileLoader>()
@@ -49,12 +53,6 @@ namespace ApplicationTests
                 .AddSingleton(ConfigurationGenerators.CreateCommandConfiguration())
                 .AddSingleton<IConfigurationHandler<ApplicationConfiguration>, ApplicationConfigurationHandlerMock>();
 
-            serviceCollection.AddSingleton(_sp => new IW4MServer(_sp.GetRequiredService<IManager>(), ConfigurationGenerators.CreateServerConfiguration(),
-                _sp.GetRequiredService<ITranslationLookup>(), _sp.GetRequiredService<IRConConnectionFactory>(), _sp.GetRequiredService<IGameLogReaderFactory>(), _sp.GetRequiredService<IMetaService>())
-            {
-                RconParser = _sp.GetRequiredService<IRConParser>()
-            });
-
             return serviceCollection;
         }
 

Tests/ApplicationTests/IOTests.cs

@@ -1,12 +1,11 @@
 using FakeItEasy;
-using IW4MAdmin;
 using IW4MAdmin.Application.IO;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
-using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Threading.Tasks;
+using SharedLibraryCore;
 
 namespace ApplicationTests
 {
@@ -19,19 +18,24 @@ namespace ApplicationTests
         [SetUp]
         public void Setup()
         {
-            serviceProvider = new ServiceCollection().BuildBase().BuildServiceProvider();
+            serviceProvider = new ServiceCollection()
+                .BuildBase()
+                .AddSingleton(new Uri[] { new Uri("C:\\test.log")})
+                .AddSingleton(A.Fake<IGameLogReaderFactory>())
+                .AddSingleton<GameLogEventDetection>()
+                .BuildServiceProvider();
         }
 
         [Test]
         public async Task GameLogEventDetection_WorksAfterFileSizeReset()
         {
             var reader = A.Fake<IGameLogReader>();
-            var factory = A.Fake<IGameLogReaderFactory>();
+            var factory = serviceProvider.GetRequiredService<IGameLogReaderFactory>();
 
             A.CallTo(() => factory.CreateGameLogReader(A<Uri[]>.Ignored, A<IEventParser>.Ignored))
                 .Returns(reader);
 
-            var detect = new GameLogEventDetection(serviceProvider.GetService<IW4MServer>(), new Uri[] { new Uri("C:\\test.log") }, factory);
+            var detect = serviceProvider.GetRequiredService<GameLogEventDetection>();
 
             A.CallTo(() => reader.Length)
                 .Returns(100)

Tests/ApplicationTests/IW4MServerTests.cs

@@ -11,9 +11,11 @@ using SharedLibraryCore.Database.Models;
 using System.Threading.Tasks;
 using ApplicationTests.Mocks;
 using System.Linq;
+using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Configuration;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
@@ -39,6 +41,8 @@ namespace ApplicationTests
             fakeRConParser = serviceProvider.GetRequiredService<IRConParser>();
             mockEventHandler = serviceProvider.GetRequiredService<EventHandlerMock>();
             appConfig = serviceProvider.GetRequiredService<ApplicationConfiguration>();
+            serviceProvider.GetService<IW4MServer>().RconParser =
+                serviceProvider.GetService<IRConParser>();
 
             var rconConnectionFactory = serviceProvider.GetRequiredService<IRConConnectionFactory>();
 
@@ -213,7 +217,7 @@ namespace ApplicationTests
 
             await server.Ban("test reason", target, origin);
 
-            A.CallTo(() => fakeRConParser.ExecuteCommandAsync(fakeRConConnection, "kick"))
+            A.CallTo(() => server.RconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, "kick"))
                 .MustHaveHappenedOnceExactly();
         }
 
@@ -288,7 +292,7 @@ namespace ApplicationTests
 
             await server.TempBan("test reason", TimeSpan.Zero, target, origin);
 
-            A.CallTo(() => fakeRConParser.ExecuteCommandAsync(fakeRConConnection, "kick"))
+            A.CallTo(() => server.RconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, "kick"))
                 .MustHaveHappenedOnceExactly();
         }
 
@@ -310,7 +314,7 @@ namespace ApplicationTests
 
             await server.TempBan("test reason", TimeSpan.Zero, target, origin);
 
-            A.CallTo(() => fakeRConParser.ExecuteCommandAsync(fakeRConConnection, "kick"))
+            A.CallTo(() => server.RconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, "kick"))
                 .MustHaveHappenedOnceExactly();
         }
         #endregion
@@ -346,7 +350,7 @@ namespace ApplicationTests
 
             await server.Kick("test reason", target, origin);
 
-            A.CallTo(() => fakeRConParser.ExecuteCommandAsync(fakeRConConnection, "kick"))
+            A.CallTo(() => server.RconParser.ExecuteCommandAsync(A<IRConConnection>.Ignored, "kick"))
                 .MustHaveHappenedOnceExactly();
         }
 
@@ -529,9 +533,6 @@ namespace ApplicationTests
             {
                 await server.ProcessUpdatesAsync(new System.Threading.CancellationToken());
             }
-
-            A.CallTo(() => fakeLogger.WriteError(A<string>.Ignored))
-              .MustNotHaveHappened();
         }
 
         [Test]
@@ -555,9 +556,6 @@ namespace ApplicationTests
                 await server.ExecuteEvent(e);
             }
 
-            A.CallTo(() => fakeLogger.WriteError(A<string>.Ignored))
-                .MustHaveHappenedOnceExactly();
-
             Assert.IsNotEmpty(mockEventHandler.Events.Where(_event => _event.Type == GameEvent.EventType.ConnectionLost));
             Assert.AreEqual("err", (mockEventHandler.Events[0].Extra as NetworkException).Message);
         }

Tests/ApplicationTests/PluginTests.cs

@@ -11,11 +11,9 @@ using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.Services;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
@@ -53,7 +51,7 @@ namespace ApplicationTests
         [Test]
         public async Task Test_GenericGuidClientIsKicked()
         {
-            var plugin = new ScriptPlugin(Path.Join(PLUGIN_DIR, "SharedGUIDKick.js"), PLUGIN_DIR);
+            var plugin = new ScriptPlugin(serviceProvider.GetRequiredService<ILogger>(), Path.Join(PLUGIN_DIR, "SharedGUIDKick.js"), PLUGIN_DIR);
             var server = serviceProvider.GetRequiredService<IW4MServer>();
             server.GameName = Server.Game.IW4;
             var client = ClientGenerators.CreateBasicClient(server, hasIp: false, clientState: EFClient.ClientState.Connecting);

Tests/ApplicationTests/ServerTests.cs

@@ -1,41 +1,32 @@
 using FakeItEasy;
 using IW4MAdmin;
-using IW4MAdmin.Application;
 using IW4MAdmin.Application.EventParsers;
 using NUnit.Framework;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using System;
-using System.Diagnostics;
+using Microsoft.Extensions.DependencyInjection;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
     [TestFixture]
     public class ServerTests
     {
-        ILogger logger;
-
+        private IServiceProvider _serviceProvider;
+        
         [SetUp]
         public void Setup()
         {
-            logger = A.Fake<ILogger>();
-
-            void testLog(string msg) => Console.WriteLine(msg);
-
-            A.CallTo(() => logger.WriteError(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
-            A.CallTo(() => logger.WriteWarning(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
-            A.CallTo(() => logger.WriteInfo(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
-            A.CallTo(() => logger.WriteDebug(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
+            _serviceProvider = new ServiceCollection()
+                .BuildBase()
+                .BuildServiceProvider();
         }
 
         [Test]
         public void GameTimeFalseQuitTest()
         {
-            var mgr = A.Fake<IManager>();
-            var server = new IW4MServer(mgr,
-                new SharedLibraryCore.Configuration.ServerConfiguration() { IPAddress = "127.0.0.1", Port = 28960 },
-                A.Fake<ITranslationLookup>(), A.Fake<IRConConnectionFactory>(), A.Fake<IGameLogReaderFactory>(), A.Fake<IMetaService>());
-
+            var server = _serviceProvider.GetRequiredService<IW4MServer>();
             var parser = new BaseEventParser(A.Fake<IParserRegexFactory>(), A.Fake<ILogger>(), A.Fake<ApplicationConfiguration>());
             parser.Configuration.GuidNumberStyle = System.Globalization.NumberStyles.Integer;
 
@@ -55,13 +46,7 @@ namespace ApplicationTests
         [Test]
         public void LogFileReplay()
         {
-            var mgr = A.Fake<IManager>();
-            A.CallTo(() => mgr.GetLogger(A<long>.Ignored)).Returns(logger);
-
-            var server = new IW4MServer(mgr,
-                new SharedLibraryCore.Configuration.ServerConfiguration() { IPAddress = "127.0.0.1", Port = 28960 },
-                A.Fake<ITranslationLookup>(), A.Fake<IRConConnectionFactory>(), A.Fake<IGameLogReaderFactory>(), A.Fake<IMetaService>());
-
+            var server = _serviceProvider.GetRequiredService<IW4MServer>();
             var parser = new BaseEventParser(A.Fake<IParserRegexFactory>(), A.Fake<ILogger>(), A.Fake<ApplicationConfiguration>());
             parser.Configuration.GuidNumberStyle = System.Globalization.NumberStyles.Integer;
 
@@ -70,7 +55,6 @@ namespace ApplicationTests
             foreach (string line in log)
             {
                 var e = parser.GenerateGameEvent(line);
-                server.Logger.WriteInfo($"{e.GameTime}");
                 if (e.Origin != null)
                 {
                     e.Origin.CurrentServer = server;

Tests/ApplicationTests/StatsTests.cs

@@ -6,7 +6,6 @@ using FakeItEasy;
 using IW4MAdmin.Application.EventParsers;
 using System.Linq;
 using IW4MAdmin.Plugins.Stats.Models;
-using IW4MAdmin.Application.Helpers;
 using IW4MAdmin.Plugins.Stats.Config;
 using System.Collections.Generic;
 using SharedLibraryCore.Database.Models;
@@ -17,6 +16,7 @@ using System.Threading.Tasks;
 using Stats.Helpers;
 using Stats.Dtos;
 using SharedLibraryCore.Configuration;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace ApplicationTests
 {
@@ -35,19 +35,15 @@ namespace ApplicationTests
             handlerFactory = A.Fake<IConfigurationHandlerFactory>();
 
             serviceProvider = new ServiceCollection()
-                .AddSingleton<StatsResourceQueryHelper>()
                 .BuildBase()
+                .AddSingleton(A.Fake<IConfigurationHandler<StatsConfiguration>>())
+                .AddSingleton<StatsResourceQueryHelper>()
+                .AddSingleton(new ServerConfiguration() { IPAddress = "127.0.0.1", Port = 28960 })
+                .AddSingleton<StatManager>()
                 .AddSingleton<IW4MAdmin.Plugins.Stats.Plugin>()
                 .BuildServiceProvider();
 
             contextFactory = serviceProvider.GetRequiredService<IDatabaseContextFactory>();
-
-            void testLog(string msg) => Console.WriteLine(msg);
-
-            A.CallTo(() => logger.WriteError(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
-            A.CallTo(() => logger.WriteWarning(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
-            A.CallTo(() => logger.WriteInfo(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
-            A.CallTo(() => logger.WriteDebug(A<string>.Ignored)).Invokes((string msg) => testLog(msg));
         }
 
         [Test]
@@ -66,13 +62,7 @@ namespace ApplicationTests
             A.CallTo(() => handlerFactory.GetConfigurationHandler<StatsConfiguration>(A<string>.Ignored))
                 .Returns(config);
 
-            A.CallTo(() => mgr.GetLogger(A<long>.Ignored))
-                .Returns(logger);
-
-            var server = new IW4MServer(mgr,
-                new SharedLibraryCore.Configuration.ServerConfiguration() { IPAddress = "127.0.0.1", Port = 28960 },
-                A.Fake<ITranslationLookup>(),
-                A.Fake<IRConConnectionFactory>(), A.Fake<IGameLogReaderFactory>(), A.Fake<IMetaService>());
+            var server = serviceProvider.GetRequiredService<IW4MServer>();
 
             var parser = new BaseEventParser(A.Fake<IParserRegexFactory>(), A.Fake<ILogger>(), A.Fake<ApplicationConfiguration>());
             parser.Configuration.GuidNumberStyle = System.Globalization.NumberStyles.Integer;
@@ -135,8 +125,8 @@ namespace ApplicationTests
         public async Task Test_ConcurrentCallsToUpdateStatHistoryDoesNotCauseException()
         {
             var server = serviceProvider.GetRequiredService<IW4MServer>();
-            var configHandler = A.Fake<IConfigurationHandler<StatsConfiguration>>();
-            var mgr = new StatManager(serviceProvider.GetRequiredService<IManager>(), serviceProvider.GetRequiredService<IDatabaseContextFactory>(), configHandler);
+            var configHandler = serviceProvider.GetRequiredService<IConfigurationHandler<StatsConfiguration>>();
+            var mgr = serviceProvider.GetRequiredService<StatManager>();
             var target = ClientGenerators.CreateDatabaseClient();
             target.CurrentServer = server;
 
@@ -148,10 +138,11 @@ namespace ApplicationTests
 
             var dbFactory = serviceProvider.GetRequiredService<IDatabaseContextFactory>();
             var db = dbFactory.CreateContext(true);
-            db.Set<EFServer>().Add(new EFServer()
+            var efServer = new EFServer()
             {
                 EndPoint = server.EndPoint.ToString()
-            });
+            };
+            db.Set<EFServer>().Add(efServer);
 
             db.Clients.Add(target);
             db.SaveChanges();
@@ -161,6 +152,10 @@ namespace ApplicationTests
             var stats = target.GetAdditionalProperty<EFClientStatistics>("ClientStats");
 
             await mgr.UpdateStatHistory(target, stats);
+
+            db.Clients.Remove(target);
+            db.Set<EFServer>().Remove(efServer);
+            await db.SaveChangesAsync();
         }
 
         #region QUERY_HELPER
@@ -168,7 +163,7 @@ namespace ApplicationTests
         public async Task Test_StatsQueryHelper_Get()
         {
             var queryHelper = serviceProvider.GetRequiredService<StatsResourceQueryHelper>();
-            using var context = contextFactory.CreateContext();
+            await using var context = contextFactory.CreateContext();
 
             var server = new EFServer() { ServerId = 1 };
             var stats = new EFClientStatistics()

WebfrontCore/Controllers/API/ClientController.cs

@@ -1,12 +1,13 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using WebfrontCore.Controllers.API.Dtos;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace WebfrontCore.Controllers.API
 {
@@ -20,7 +21,7 @@ namespace WebfrontCore.Controllers.API
         private readonly IResourceQueryHelper<FindClientRequest, FindClientResult> _clientQueryHelper;
         private readonly ILogger _logger;
 
-        public ClientController(ILogger logger, IResourceQueryHelper<FindClientRequest, FindClientResult> clientQueryHelper)
+        public ClientController(ILogger<ClientController> logger, IResourceQueryHelper<FindClientRequest, FindClientResult> clientQueryHelper)
         {
             _logger = logger;
             _clientQueryHelper = clientQueryHelper;
@@ -53,8 +54,7 @@ namespace WebfrontCore.Controllers.API
 
             catch (Exception e)
             {
-                _logger.WriteWarning($"Failed to retrieve clients with query - {request.ToDebugString()}");
-                _logger.WriteDebug(e.GetExceptionInfo());
+                _logger.LogWarning(e, "Failed to retrieve clients with query - {@request}", request);
 
                 return StatusCode(StatusCodes.Status500InternalServerError, new ErrorResponse()
                 {

WebfrontCore/Controllers/ClientController.cs

@@ -171,7 +171,7 @@ namespace WebfrontCore.Controllers
 
             var meta = await ProfileMetaListViewComponent.GetClientMeta(_metaService, metaFilterType, Client.Level, request);
 
-            if (meta.Count() == 0)
+            if (!meta.Any())
             {
                 return Ok();
             }

WebfrontCore/Controllers/HomeController.cs

@@ -3,19 +3,22 @@ using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Server;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace WebfrontCore.Controllers
 {
     public class HomeController : BaseController
     {
         private readonly ITranslationLookup _translationLookup;
+        private readonly ILogger _logger;
 
-        public HomeController(IManager manager, ITranslationLookup translationLookup) : base(manager)
+        public HomeController(ILogger<HomeController> logger, IManager manager, ITranslationLookup translationLookup) : base(manager)
         {
+            _logger = logger;
             _translationLookup = translationLookup;
         }
 
@@ -43,10 +46,7 @@ namespace WebfrontCore.Controllers
         public IActionResult Error()
         {
             var exceptionFeature = HttpContext.Features.Get<IExceptionHandlerPathFeature>();
-            Manager.GetLogger(0).WriteError($"[Webfront] {exceptionFeature.Error.Message}");
-            Manager.GetLogger(0).WriteDebug(exceptionFeature.Path);
-            Manager.GetLogger(0).WriteDebug(exceptionFeature.Error.StackTrace);
-
+            _logger.LogError("[Webfront] {path} {message} {@exception}", exceptionFeature.Path, exceptionFeature.Error.Message, exceptionFeature.Error);
             ViewBag.Description = Localization["WEBFRONT_ERROR_DESC"];
             ViewBag.Title = Localization["WEBFRONT_ERROR_TITLE"];
             return View(exceptionFeature.Error);

WebfrontCore/Middleware/IPWhitelist.cs

@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Http;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace WebfrontCore.Middleware
 {
@@ -22,7 +21,7 @@ namespace WebfrontCore.Middleware
         /// </summary>
         /// <param name="nextRequest"></param>
         /// <param name="whitelistedIps">list of textual ip addresses</param>
-        public IPWhitelist(RequestDelegate nextRequest, ILogger logger, string[] whitelistedIps)
+        public IPWhitelist(RequestDelegate nextRequest, ILogger<IPWhitelist> logger, string[] whitelistedIps)
         {
             _whitelistedIps = whitelistedIps.Select(_ip => System.Net.IPAddress.Parse(_ip).GetAddressBytes()).ToArray();
             _nextRequest = nextRequest;
@@ -31,21 +30,21 @@ namespace WebfrontCore.Middleware
 
         public async Task Invoke(HttpContext context)
         {
-            bool isAlllowed = true;
+            var isAllowed = true;
 
             if (_whitelistedIps.Length > 0)
             {
-                isAlllowed = _whitelistedIps.Any(_ip => _ip.SequenceEqual(context.Connection.RemoteIpAddress.GetAddressBytes()));
+                isAllowed = _whitelistedIps.Any(_ip => _ip.SequenceEqual(context.Connection.RemoteIpAddress.GetAddressBytes()));
             }
 
-            if (isAlllowed)
+            if (isAllowed)
             {
                 await _nextRequest.Invoke(context);
             }
 
             else
             {
-                _logger.WriteInfo($"Blocking HTTP request from {context.Connection.RemoteIpAddress.ToString()}");
+                _logger.LogDebug("Blocking HTTP request from {ipAddress}", context.Connection.RemoteIpAddress);
                 context.Abort();
             }
         }

WebfrontCore/Startup.cs

@@ -79,11 +79,11 @@ namespace WebfrontCore
                 });
 
 #if DEBUG
-            mvcBuilder = mvcBuilder.AddRazorRuntimeCompilation();
+            /*mvcBuilder = mvcBuilder.AddRazorRuntimeCompilation();
             services.Configure<RazorViewEngineOptions>(_options =>
             {
                 _options.ViewLocationFormats.Add(@"/Views/Plugins/{1}/{0}" + RazorViewEngine.ViewExtension);
-            });
+            });*/
 #endif
 
             foreach (var asm in pluginAssemblies())
@@ -103,13 +103,6 @@ namespace WebfrontCore
                     options.LoginPath = "/";
                 });
 
-#if DEBUG
-            services.AddLogging(_builder =>
-            {
-                _builder.AddDebug();
-            });
-#endif
-
             services.AddSingleton(Program.Manager);
             services.AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>();
             services.AddTransient<IValidator<FindClientRequest>, FindClientRequestValidator>();
@@ -121,7 +114,6 @@ namespace WebfrontCore
             services.AddSingleton(Program.ApplicationServiceProvider.GetService<IDatabaseContextFactory>());
             services.AddSingleton(Program.ApplicationServiceProvider.GetService<IAuditInformationRepository>());
             services.AddSingleton(Program.ApplicationServiceProvider.GetService<ITranslationLookup>());
-            services.AddSingleton(Program.ApplicationServiceProvider.GetService<SharedLibraryCore.Interfaces.ILogger>());
             services.AddSingleton(Program.ApplicationServiceProvider.GetService<IEnumerable<IManagerCommand>>());
             services.AddSingleton(Program.ApplicationServiceProvider.GetService<IMetaService>());
             services.AddSingleton(Program.ApplicationServiceProvider.GetService<ApplicationConfiguration>());
@@ -152,7 +144,7 @@ namespace WebfrontCore
 
             if (Program.Manager.GetApplicationSettings().Configuration().EnableWebfrontConnectionWhitelist)
             {
-                app.UseMiddleware<IPWhitelist>(manager.GetLogger(0), manager.GetApplicationSettings().Configuration().WebfrontConnectionWhitelist);
+                app.UseMiddleware<IPWhitelist>(Program.ApplicationServiceProvider.GetService<ILogger<IPWhitelist>>(), manager.GetApplicationSettings().Configuration().WebfrontConnectionWhitelist);
             }
 
             app.UseStaticFiles();

WebfrontCore/ViewComponents/PenaltyListViewComponent.cs

@@ -14,7 +14,7 @@ namespace WebfrontCore.ViewComponents
             var penalties = await Program.Manager.GetPenaltyService().GetRecentPenalties(PENALTY_COUNT, offset, showOnly, ignoreAutomated);
             penalties = User.Identity.IsAuthenticated ? penalties : penalties.Where(p => !p.Sensitive).ToList();
 
-            return View("_List", penalties);
+            return View("~/Views/Penalty/PenaltyInfoList.cshtml", penalties);
         }
     }
 }

WebfrontCore/Views/Client/Find/Index.cshtml

@@ -1,4 +1,4 @@
-@model List<SharedLibraryCore.Dtos.PlayerInfo>
+@model IList<SharedLibraryCore.Dtos.PlayerInfo>
 @{
     var loc = SharedLibraryCore.Utilities.CurrentLocalization.LocalizationIndex;
 }

WebfrontCore/Views/Client/Profile/Index.cshtml

@@ -50,7 +50,7 @@
                 }
             </div>
         }
-        @if (Model.ActivePenalty != null)
+        @if (Model.ActivePenalty != null && (Model.ActivePenalty.Type != EFPenalty.PenaltyType.Flag || ViewBag.Authorized))
         {
             <div class="font-weight-bold h4 mb-0 penalties-color-@Model.ActivePenalty.Type.ToString().ToLower()">
                 @foreach (var result in Utilities.SplitTranslationTokens(translationKey))