Karolis/Aurora-Server-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds logging to BYOND service

Browse Source
This commit is contained in:
Karolis2011
2019-08-24 18:39:08 +03:00
parent a05d8ce8bf
commit 604fdbf21d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ASS.Server/Services/ByondService.cs
View File

@@ -12,6 +12,7 @@ using Microsoft.Extensions.Configuration;
using System.IO.Compression; using System.IO.Compression;
using System.IO; using System.IO;
using Google.Protobuf; using Google.Protobuf;
using Microsoft.Extensions.Logging;
namespace ASS.Server.Services namespace ASS.Server.Services
{ {
@@ -23,13 +24,14 @@ namespace ASS.Server.Services
HttpClient httpclient; HttpClient httpclient;
IConfiguration config; IConfiguration config;
IConfiguration globalConfig; IConfiguration globalConfig;
ILogger logger;
public ByondService(HttpClient _httpClient, IConfiguration configuration) public ByondService(HttpClient _httpClient, IConfiguration configuration, ILogger<ByondService> log)
{ {
httpclient = _httpClient; httpclient = _httpClient;
globalConfig = configuration; globalConfig = configuration;
config = configuration.GetSection("BYOND"); config = configuration.GetSection("BYOND");
logger = log;
} }
public static string GetDownloadUrl(int major, int minor) => GetDownloadUrl(major.ToString(), minor.ToString()); public static string GetDownloadUrl(int major, int minor) => GetDownloadUrl(major.ToString(), minor.ToString());
@@ -83,9 +85,15 @@ namespace ASS.Server.Services
public async Task SwitchToVersion(ByondVersion version) public async Task SwitchToVersion(ByondVersion version)
{ {
if (version.Equals(getVersion())) if (version.Equals(getVersion()))
{
logger.LogInformation($"Server is on {version.Major}.{version.Minor} version. No switch is needed.");
return; return;
}
if (!Directory.Exists(GetByondDirectoryPath(version))) if (!Directory.Exists(GetByondDirectoryPath(version)))
{
logger.LogInformation($"Version {version.Major}.{version.Minor} is not installed. Downloading and installing...");
await DownloadByond(version); await DownloadByond(version);
}
if (!getVersion(GetByondDirectoryPath(version)).Equals(version)) if (!getVersion(GetByondDirectoryPath(version)).Equals(version))
throw new Exception($"Byond version '{version.Major}.{version.Minor}' data mismatches folder name or ByondVersion data. Please manually remove this version."); throw new Exception($"Byond version '{version.Major}.{version.Minor}' data mismatches folder name or ByondVersion data. Please manually remove this version.");
if (Directory.Exists(GetByondDirectoryPath())) if (Directory.Exists(GetByondDirectoryPath()))