Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fixes for things that should have been in the previous release

Browse Source 
console output reenabled
server start task actually runs
This commit is contained in:
RaidMax 2019-05-09 20:00:00 -05:00
parent 1dc0f5a240
commit b99cc424e7
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Application/Application.csproj
View File

@ -6,7 +6,7 @@
<RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
<MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish> <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
<PackageId>RaidMax.IW4MAdmin.Application</PackageId> <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
<Version>2.2.7.2</Version> <Version>2.2.7.3</Version>
<Authors>RaidMax</Authors> <Authors>RaidMax</Authors>
<Company>Forever None</Company> <Company>Forever None</Company>
<Product>IW4MAdmin</Product> <Product>IW4MAdmin</Product>
@ -32,8 +32,8 @@
<PropertyGroup> <PropertyGroup>
<ServerGarbageCollection>true</ServerGarbageCollection> <ServerGarbageCollection>true</ServerGarbageCollection>
<TieredCompilation>true</TieredCompilation> <TieredCompilation>true</TieredCompilation>
<AssemblyVersion>2.2.7.2</AssemblyVersion> <AssemblyVersion>2.2.7.3</AssemblyVersion>
<FileVersion>2.2.7.2</FileVersion> <FileVersion>2.2.7.3</FileVersion>
<LangVersion>7.1</LangVersion> <LangVersion>7.1</LangVersion>
</PropertyGroup> </PropertyGroup>
@ -47,6 +47,12 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Update="DefaultSettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="Microsoft.NETCore.App" Version="2.2.2" /> <PackageReference Update="Microsoft.NETCore.App" Version="2.2.2" />
</ItemGroup> </ItemGroup>

4
Application/ApplicationManager.cs
View File

@ -656,9 +656,9 @@ namespace IW4MAdmin.Application
} }
} }
public Task Start() public async Task Start()
{ {
return Task.WhenAll(new[] await Task.WhenAll(new[]
{ {
SendHeartbeat(), SendHeartbeat(),
UpdateServerStates() UpdateServerStates()

3
Application/Main.cs
View File

@ -85,6 +85,7 @@ namespace IW4MAdmin.Application
Console.WriteLine(e.Message); Console.WriteLine(e.Message);
Console.WriteLine(exitMessage); Console.WriteLine(exitMessage);
Console.ReadKey(); Console.ReadKey();
return;
} }
try try
@ -113,9 +114,9 @@ namespace IW4MAdmin.Application
var tasks = new[] var tasks = new[]
{ {
ServerManager.Start(),
webfrontTask, webfrontTask,
ReadConsoleInput(), ReadConsoleInput(),
ServerManager.Start(),
}; };
await Task.WhenAll(tasks); await Task.WhenAll(tasks);

5
Application/Misc/Logger.cs
View File

@ -1,12 +1,12 @@
using SharedLibraryCore; using SharedLibraryCore;
using SharedLibraryCore.Interfaces;
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
namespace IW4MAdmin.Application namespace IW4MAdmin.Application
{ {
class Logger : SharedLibraryCore.Interfaces.ILogger class Logger : ILogger
{ {
enum LogType enum LogType
{ {
@ -55,7 +55,6 @@ namespace IW4MAdmin.Application
void Write(string msg, LogType type) void Write(string msg, LogType type)
{ {
return;
OnLogWriting.Wait(); OnLogWriting.Wait();
string stringType = type.ToString(); string stringType = type.ToString();