diff --git a/Application/Application.csproj b/Application/Application.csproj index b12c87b08..6f0bc90f0 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -6,7 +6,7 @@ 2.2.2 false RaidMax.IW4MAdmin.Application - 2.2.7.2 + 2.2.7.3 RaidMax Forever None IW4MAdmin @@ -32,8 +32,8 @@ true true - 2.2.7.2 - 2.2.7.2 + 2.2.7.3 + 2.2.7.3 7.1 @@ -47,6 +47,12 @@ + + + Always + + + diff --git a/Application/ApplicationManager.cs b/Application/ApplicationManager.cs index 2175e01f6..5f30ef907 100644 --- a/Application/ApplicationManager.cs +++ b/Application/ApplicationManager.cs @@ -656,9 +656,9 @@ namespace IW4MAdmin.Application } } - public Task Start() + public async Task Start() { - return Task.WhenAll(new[] + await Task.WhenAll(new[] { SendHeartbeat(), UpdateServerStates() diff --git a/Application/Main.cs b/Application/Main.cs index b56b26144..db26b61d3 100644 --- a/Application/Main.cs +++ b/Application/Main.cs @@ -85,6 +85,7 @@ namespace IW4MAdmin.Application Console.WriteLine(e.Message); Console.WriteLine(exitMessage); Console.ReadKey(); + return; } try @@ -113,9 +114,9 @@ namespace IW4MAdmin.Application var tasks = new[] { + ServerManager.Start(), webfrontTask, ReadConsoleInput(), - ServerManager.Start(), }; await Task.WhenAll(tasks); diff --git a/Application/Misc/Logger.cs b/Application/Misc/Logger.cs index 79080c667..8b4cc9462 100644 --- a/Application/Misc/Logger.cs +++ b/Application/Misc/Logger.cs @@ -1,12 +1,12 @@ using SharedLibraryCore; +using SharedLibraryCore.Interfaces; using System; -using System.Collections.Generic; using System.IO; using System.Threading; namespace IW4MAdmin.Application { - class Logger : SharedLibraryCore.Interfaces.ILogger + class Logger : ILogger { enum LogType { @@ -55,7 +55,6 @@ namespace IW4MAdmin.Application void Write(string msg, LogType type) { - return; OnLogWriting.Wait(); string stringType = type.ToString();