Change how the deployment complete chat message is worded

This commit is contained in:
Jordan Brown
2020-04-27 22:14:37 -04:00
parent 8849b1f5ad
commit 0a6022ceb4
6 changed files with 24 additions and 2 deletions
@@ -444,7 +444,7 @@ namespace Tgstation.Server.Host.Components.Deployment
await Task.WhenAll(symATask, symBTask).ConfigureAwait(false);
await chatManager.SendUpdateMessage(String.Format(CultureInfo.InvariantCulture, "Deployment complete!{0}", watchdog.Running ? " Changes will be applied on next server reboot." : String.Empty), cancellationToken).ConfigureAwait(false);
await chatManager.SendUpdateMessage(String.Format(CultureInfo.InvariantCulture, "Deployment complete! Changes will be applied {0}.", watchdog.DeploymentApplicationTime), cancellationToken).ConfigureAwait(false);
logger.LogDebug("Compile complete!");
}
@@ -25,6 +25,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public sealed override Models.CompileJob ActiveCompileJob => Server?.Dmb.CompileJob;
/// <inheritdoc />
protected override string DeploymentTimeWhileRunning => "immediately";
/// <inheritdoc />
public sealed override RebootState? RebootState => Server?.RebootState;
@@ -34,6 +34,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public override RebootState? RebootState => Running ? (AlphaIsActive ? alphaServer?.RebootState : bravoServer?.RebootState) : null;
/// <inheritdoc />
protected override string DeploymentTimeWhileRunning => "when DreamDaemon reboots";
/// <summary>
/// Server designation alpha
/// </summary>
@@ -21,6 +21,11 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// </summary>
bool AlphaIsActive { get; }
/// <summary>
/// When new <see cref="Models.CompileJob"/>s will be made active.
/// </summary>
string DeploymentApplicationTime { get; }
/// <summary>
/// The <see cref="CompileJob"/> currently running on the server
/// </summary>
@@ -37,7 +42,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
DreamDaemonLaunchParameters LastLaunchParameters { get; }
/// <summary>
/// The <see cref="Components.Watchdog.RebootState"/> of the active server
/// The <see cref="Watchdog.RebootState"/> of the active server
/// </summary>
RebootState? RebootState { get; }
@@ -32,6 +32,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public abstract bool AlphaIsActive { get; }
/// <inheritdoc />
public string DeploymentApplicationTime => Running ? DeploymentTimeWhileRunning : "when DreamDaemon is launched";
/// <inheritdoc />
public abstract Models.CompileJob ActiveCompileJob { get; }
@@ -44,6 +47,11 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public abstract RebootState? RebootState { get; }
/// <summary>
/// When deployments happen if the <see cref="IWatchdog"/> is <see cref="Running"/>.
/// </summary>
protected abstract string DeploymentTimeWhileRunning { get; }
/// <summary>
/// <see cref="TaskCompletionSource{TResult}"/> that completes when <see cref="ActiveLaunchParameters"/> are changed and we are <see cref="Running"/>.
/// </summary>
@@ -19,6 +19,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// </summary>
sealed class WindowsWatchdog : BasicWatchdog
{
/// <inheritdoc />
protected override string DeploymentTimeWhileRunning => "when DreamDaemon reboots";
/// <summary>
/// The <see cref="IIOManager"/> for the <see cref="WindowsWatchdog"/>.
/// </summary>