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

Fixes involving ConfigurationType and AutoUpdateInterval

Browse Source
This commit is contained in:
Cyberboss
2018-08-27 15:54:25 -04:00
parent 04534cfd0e
commit d1038c4738
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Api/Models/Instance.cs
+6 -3
View File
@@ -28,6 +28,7 @@ namespace Tgstation.Server.Api.Models
/// <summary>
/// If the <see cref="Instance"/> is online
/// </summary>
[Required]
public bool? Online { get; set; }
/// <summary>
@@ -37,9 +38,10 @@ namespace Tgstation.Server.Api.Models
public ConfigurationType? ConfigurationType { get; set; }
/// <summary>
/// The time interval in minutes the repository is automatically pulled and compiles
/// The time interval in minutes the repository is automatically pulled and compiles. 0 disables
/// </summary>
public int? AutoUpdateInterval { get; set; }
[Required]
public uint? AutoUpdateInterval { get; set; }
/// <summary>
/// The <see cref="Job"/> representing a change of <see cref="Path"/>
@@ -54,7 +56,8 @@ namespace Tgstation.Server.Api.Models
Name = Name,
Path = Path,
Online = Online,
ConfigurationType = ConfigurationType
ConfigurationType = ConfigurationType,
AutoUpdateInterval = AutoUpdateInterval
};
}
}
src/Tgstation.Server.Host/Components/IInstance.cs
+1 -1
View File
@@ -74,6 +74,6 @@ namespace Tgstation.Server.Host.Components
/// </summary>
/// <param name="newInterval">The new auto update inteval</param>
/// <returns>A <see cref="Task"/> representing the running operation</returns>
Task SetAutoUpdateInterval(int? newInterval);
Task SetAutoUpdateInterval(uint newInterval);
}
}
src/Tgstation.Server.Host/Components/Instance.cs
+7 -7
View File
@@ -113,12 +113,12 @@ namespace Tgstation.Server.Host.Components
/// <param name="minutes">How many minutes the operation should repeat. Does not include running time</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task"/> representing the running operation</returns>
async Task TimerLoop(int minutes, CancellationToken cancellationToken)
async Task TimerLoop(uint minutes, CancellationToken cancellationToken)
{
while (true)
try
{
await Task.Delay(new TimeSpan(0, minutes, 0), cancellationToken).ConfigureAwait(false);
await Task.Delay(new TimeSpan(0, minutes > Int32.MaxValue ? Int32.MaxValue : (int)minutes, 0), cancellationToken).ConfigureAwait(false);
try
{
@@ -229,7 +229,7 @@ namespace Tgstation.Server.Host.Components
/// <inheritdoc />
public async Task StartAsync(CancellationToken cancellationToken)
{
await Task.WhenAll(SetAutoUpdateInterval(metadata.AutoUpdateInterval), Configuration.StartAsync(cancellationToken), ByondManager.StartAsync(cancellationToken), Chat.StartAsync(cancellationToken), CompileJobConsumer.StartAsync(cancellationToken)).ConfigureAwait(false);
await Task.WhenAll(SetAutoUpdateInterval(metadata.AutoUpdateInterval.Value), Configuration.StartAsync(cancellationToken), ByondManager.StartAsync(cancellationToken), Chat.StartAsync(cancellationToken), CompileJobConsumer.StartAsync(cancellationToken)).ConfigureAwait(false);
//dependent on so many things, its just safer this way
await Watchdog.StartAsync(cancellationToken).ConfigureAwait(false);
@@ -243,10 +243,10 @@ namespace Tgstation.Server.Host.Components
}
/// <inheritdoc />
public Task StopAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(null), Configuration.StopAsync(cancellationToken), ByondManager.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken), Chat.StopAsync(cancellationToken), CompileJobConsumer.StopAsync(cancellationToken));
public Task StopAsync(CancellationToken cancellationToken) => Task.WhenAll(SetAutoUpdateInterval(0), Configuration.StopAsync(cancellationToken), ByondManager.StopAsync(cancellationToken), Watchdog.StopAsync(cancellationToken), Chat.StopAsync(cancellationToken), CompileJobConsumer.StopAsync(cancellationToken));
/// <inheritdoc />
public async Task SetAutoUpdateInterval(int? newInterval)
public async Task SetAutoUpdateInterval(uint newInterval)
{
Task toWait;
lock (this)
@@ -260,7 +260,7 @@ namespace Tgstation.Server.Host.Components
toWait = Task.CompletedTask;
}
await toWait.ConfigureAwait(false);
if (!newInterval.HasValue)
if (newInterval == 0)
return;
lock (this)
{
@@ -269,7 +269,7 @@ namespace Tgstation.Server.Host.Components
return;
timerCts?.Dispose();
timerCts = new CancellationTokenSource();
timerTask = TimerLoop(newInterval.Value, timerCts.Token);
timerTask = TimerLoop(newInterval, timerCts.Token);
}
}
src/Tgstation.Server.Host/Controllers/InstanceController.cs
+1
View File
@@ -139,6 +139,7 @@ namespace Tgstation.Server.Host.Controllers
Name = model.Name,
Online = false,
Path = model.Path,
AutoUpdateInterval = model.AutoUpdateInterval ?? 0,
RepositorySettings = new RepositorySettings
{
CommitterEmail = "tgstation-server@users.noreply.github.com",