cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 08:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Configuration now constantly ensures all it's directories exist

Browse Source
This commit is contained in:
Jordan Brown
2018-07-24 10:49:31 -04:00
parent edad7f5433
commit 5f8b1546bf
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Configuration.cs
+17 -3
View File
@@ -17,7 +17,7 @@ namespace Tgstation.Server.Host.Components
sealed class Configuration : IConfiguration
{
const string CodeModificationsSubdirectory = "CodeModifications";
//const string EventScriptsSubdirectory = "EventScripts";
const string EventScriptsSubdirectory = "EventScripts";
const string GameStaticFilesSubdirectory = "GameStaticFiles";
const string CodeModificationsHeadFile = "HeadInclude.dm";
@@ -58,9 +58,13 @@ namespace Tgstation.Server.Host.Components
this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
}
Task EnsureDirectories(CancellationToken cancellationToken) => Task.WhenAll(ioManager.CreateDirectory(CodeModificationsSubdirectory, cancellationToken), ioManager.CreateDirectory(EventScriptsSubdirectory, cancellationToken), ioManager.CreateDirectory(GameStaticFilesSubdirectory, cancellationToken));
/// <inheritdoc />
public async Task<ServerSideModifications> CopyDMFilesTo(string dmeFile, string destination, CancellationToken cancellationToken)
{
await EnsureDirectories(cancellationToken).ConfigureAwait(false);
//just assume no other fs race conditions here
var dmeExistsTask = ioManager.FileExists(ioManager.ConcatPath(CodeModificationsSubdirectory, dmeFile), cancellationToken);
var headFileExistsTask = ioManager.FileExists(ioManager.ConcatPath(CodeModificationsSubdirectory, CodeModificationsHeadFile), cancellationToken);
@@ -101,6 +105,7 @@ namespace Tgstation.Server.Host.Components
/// <inheritdoc />
public async Task<IReadOnlyList<ConfigurationFile>> ListDirectory(string configurationRelativePath, ISystemIdentity systemIdentity, CancellationToken cancellationToken)
{
await EnsureDirectories(cancellationToken).ConfigureAwait(false);
var path = ValidateConfigRelativePath(configurationRelativePath);
List<ConfigurationFile> result = new List<ConfigurationFile>();
@@ -132,6 +137,7 @@ namespace Tgstation.Server.Host.Components
/// <inheritdoc />
public async Task<ConfigurationFile> Read(string configurationRelativePath, ISystemIdentity systemIdentity, CancellationToken cancellationToken)
{
await EnsureDirectories(cancellationToken).ConfigureAwait(false);
var path = ValidateConfigRelativePath(configurationRelativePath);
ConfigurationFile result = null;
@@ -176,8 +182,9 @@ namespace Tgstation.Server.Host.Components
}
/// <inheritdoc />
public Task SymlinkStaticFilesTo(string destination, CancellationToken cancellationToken)
public async Task SymlinkStaticFilesTo(string destination, CancellationToken cancellationToken)
{
await EnsureDirectories(cancellationToken).ConfigureAwait(false);
async Task SymlinkBase(bool files)
{
Task<IReadOnlyList<string>> task;
@@ -189,12 +196,13 @@ namespace Tgstation.Server.Host.Components
await Task.WhenAll(entries.Select(x => symlinkFactory.CreateSymbolicLink(ioManager.ResolvePath(x), ioManager.ConcatPath(destination, x), cancellationToken))).ConfigureAwait(false);
}
return Task.WhenAll(SymlinkBase(true), SymlinkBase(false));
await Task.WhenAll(SymlinkBase(true), SymlinkBase(false)).ConfigureAwait(false);
}
/// <inheritdoc />
public async Task<ConfigurationFile> Write(string configurationRelativePath, ISystemIdentity systemIdentity, byte[] data, string previousHash, CancellationToken cancellationToken)
{
await EnsureDirectories(cancellationToken).ConfigureAwait(false);
var path = ValidateConfigRelativePath(configurationRelativePath);
ConfigurationFile result = null;
@@ -239,5 +247,11 @@ namespace Tgstation.Server.Host.Components
return result;
}
/// <inheritdoc />
public Task StartAsync(CancellationToken cancellationToken) => EnsureDirectories(cancellationToken);
/// <inheritdoc />
public Task StopAsync(CancellationToken cancellationToken) => EnsureDirectories(cancellationToken);
}
}
src/Tgstation.Server.Host/Components/IConfiguration.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using Microsoft.Extensions.Hosting;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Tgstation.Server.Api.Models;
@@ -9,7 +10,7 @@ namespace Tgstation.Server.Host.Components
/// <summary>
/// For managing the Configuration directory
/// </summary>
public interface IConfiguration
public interface IConfiguration : IHostedService
{
/// <summary>
/// Copies all files in the CodeModifications directory to <paramref name="destination"/>
src/Tgstation.Server.Host/Components/Instance.cs
+2 -2
View File
@@ -125,10 +125,10 @@ namespace Tgstation.Server.Host.Components
}
/// <inheritdoc />
public Task StartAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(metadata.AutoUpdateInterval), ByondManager.StartAsync(cancellationToken), Watchdog.StartAsync(cancellationToken), Chat.StartAsync(cancellationToken), compileJobConsumer.StartAsync(cancellationToken), Watchdog.StartAsync(cancellationToken));
public Task StartAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(metadata.AutoUpdateInterval), Configuration.StartAsync(cancellationToken), ByondManager.StartAsync(cancellationToken), Watchdog.StartAsync(cancellationToken), Chat.StartAsync(cancellationToken), compileJobConsumer.StartAsync(cancellationToken), Watchdog.StartAsync(cancellationToken));
/// <inheritdoc />
public Task StopAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(null), ByondManager.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken), Chat.StopAsync(cancellationToken), compileJobConsumer.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken));
public Task StopAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(null), Configuration.StopAsync(cancellationToken), ByondManager.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken), Chat.StopAsync(cancellationToken), compileJobConsumer.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken));
/// <inheritdoc />
public async Task SetAutoUpdateInterval(int? newInterval)
src/Tgstation.Server.Host/Controllers/ConfigurationController.cs
-4
View File
@@ -65,10 +65,6 @@ namespace Tgstation.Server.Host.Controllers
return Json(newFile);
}
catch (InvalidOperationException)
{
return BadRequest(new { message = "Attempted to delete required folder!" });
}
catch(NotImplementedException e)
{
return StatusCode((int)HttpStatusCode.NotImplemented, new { message = e.Message });