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

Merge pull request #1433 from tgstation/MinorestOfFixes [TGSDeploy]

Browse Source 
Detaching a deleted instance doesn't throw
This commit is contained in:
Jordan Dominion
2023-03-24 22:01:09 -04:00
committed by GitHub
parent c08b1d1213 fdb3672e52
commit a489a4c141
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="ControlPanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>5.3.2</TgsCoreVersion>
<TgsCoreVersion>5.3.3</TgsCoreVersion>
<TgsConfigVersion>4.4.0</TgsConfigVersion>
<TgsApiVersion>9.8.1</TgsApiVersion>
<TgsApiLibraryVersion>10.2.0</TgsApiLibraryVersion>
src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+27 -5
View File
@@ -719,18 +719,40 @@ namespace Tgstation.Server.Host.Components.Deployment
{
var noEstimate = !estimatedDuration.HasValue;
progressReporter.StageName = currentStage;
progressReporter.ReportProgress(noEstimate ? null : 0);
double? lastReport = noEstimate ? null : 0;
progressReporter.ReportProgress(lastReport);
var sleepInterval = estimatedDuration.HasValue ? estimatedDuration.Value / 100 : TimeSpan.FromMilliseconds(250);
var minimumSleepInterval = TimeSpan.FromMilliseconds(250);
var sleepInterval = estimatedDuration.HasValue ? estimatedDuration.Value / 100 : minimumSleepInterval;
if (estimatedDuration.HasValue)
{
logger.LogDebug("Compile is expected to take: {0}", estimatedDuration);
}
else
{
logger.LogTrace("No metric to estimate compile time.");
}
logger.LogDebug("Compile is expected to take: {0}", estimatedDuration);
try
{
for (var iteration = 0; iteration < (estimatedDuration.HasValue ? 99 : Int32.MaxValue); ++iteration)
{
await Task.Delay(sleepInterval, cancellationToken);
var nextInterval = DateTimeOffset.Now + sleepInterval;
do
{
var remainingSleepThisInterval = nextInterval - DateTimeOffset.Now;
var nextSleepSpan = remainingSleepThisInterval < minimumSleepInterval ? remainingSleepThisInterval : minimumSleepInterval;
await Task.Delay(nextSleepSpan, cancellationToken);
progressReporter.StageName = currentStage;
progressReporter.ReportProgress(lastReport);
}
while (DateTimeOffset.Now < nextInterval);
progressReporter.StageName = currentStage;
progressReporter.ReportProgress(noEstimate ? null : sleepInterval * (iteration + 1) / estimatedDuration.Value);
lastReport = noEstimate ? null : sleepInterval * (iteration + 1) / estimatedDuration.Value;
progressReporter.ReportProgress(lastReport);
}
}
catch (OperationCanceledException)
src/Tgstation.Server.Host/Components/Deployment/Remote/GitHubRemoteDeploymentManager.cs
+1 -1
View File
@@ -305,7 +305,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
compileJob.RevisionInformation.OriginCommitSha,
compileJob.RevisionInformation.CommitSha,
compileJob.GitHubDeploymentId.HasValue
? $"{Environment.NewLine}[GitHub Deployments](https://github.com/{remoteRepositoryOwner}/{remoteRepositoryName}/deployments/activity_log?environment=TGS%3A%20{Metadata.Name})"
? $"{Environment.NewLine}[GitHub Deployments](https://github.com/{remoteRepositoryOwner}/{remoteRepositoryName}/deployments/activity_log?environment=TGS%3A+{Metadata.Name.Replace(" ", "+", StringComparison.Ordinal)})"
: String.Empty);
/// <summary>
src/Tgstation.Server.Host/Controllers/InstanceController.cs
+2 -1
View File
@@ -303,7 +303,8 @@ namespace Tgstation.Server.Host.Controllers
var attachFileName = ioManager.ConcatPath(originalModel.Path, InstanceAttachFileName);
try
{
await ioManager.WriteAllBytes(attachFileName, Array.Empty<byte>(), cancellationToken);
if (await ioManager.DirectoryExists(originalModel.Path, cancellationToken))
await ioManager.WriteAllBytes(attachFileName, Array.Empty<byte>(), cancellationToken);
}
catch (OperationCanceledException)
{