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

Merge pull request #1018 from tgstation/Cyberboss-patch-1 [TGSDeploy][NugetDeploy]

Browse Source 
Fix DreamMaker progress task
This commit is contained in:
Jordan Brown
2020-05-24 23:25:04 -04:00
committed by GitHub
parent ed4b485cc2 e9d1ff89e0
commit e57232b476
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<!-- This is the authorative version list -->
<!-- Integration tests will ensure they match across the board -->
<TgsCoreVersion>4.2.5</TgsCoreVersion>
<TgsCoreVersion>4.2.6</TgsCoreVersion>
<TgsApiVersion>6.4.1</TgsApiVersion>
<TgsClientVersion>7.0.0</TgsClientVersion>
<TgsDmapiVersion>5.2.1</TgsDmapiVersion>
src/Tgstation.Server.Client/ApiClient.cs
+1 -1
View File
@@ -216,7 +216,7 @@ namespace Tgstation.Server.Client
try
{
var token = await RunRequest<Token>(Routes.Root, null, HttpMethod.Post, null, true, cancellationToken);
var token = await RunRequest<Token>(Routes.Root, new object(), HttpMethod.Post, null, true, cancellationToken);
headers = new ApiHeaders(headers.UserAgent!, token.Bearer!);
}
catch (ClientException)
src/Tgstation.Server.Client/ServerClientFactory.cs
+6 -3
View File
@@ -62,13 +62,16 @@ namespace Tgstation.Server.Client
token = await api.Update<Token>(Routes.Root, cancellationToken).ConfigureAwait(false);
}
var client = CreateFromToken(host, token);
var apiHeaders = new ApiHeaders(productHeaderValue, token.Bearer!);
var client = new ServerClient(ApiClientFactory.CreateApiClient(host, apiHeaders, loginHeaders), token);
if (timeout.HasValue)
client.Timeout = timeout.Value;
var apiHeaders = new ApiHeaders(productHeaderValue, token.Bearer!);
foreach (var requestLogger in requestLoggers)
client.AddRequestLogger(requestLogger);
return new ServerClient(ApiClientFactory.CreateApiClient(host, apiHeaders, loginHeaders), token);
return client;
}
/// <inheritdoc />
src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+1 -1
View File
@@ -16,7 +16,7 @@
<RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
<Copyright>2018</Copyright>
<PackageTags>json web api tgstation-server tgstation ss13 byond client</PackageTags>
<PackageReleaseNotes>.Net Standard 2.1, allow login requests to be logged.</PackageReleaseNotes>
<PackageReleaseNotes>Fixed automatic refresh erroring internally. Fixed request loggers given to ServerClientFactory not being passed to the IServerClient.</PackageReleaseNotes>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<CodeAnalysisRuleSet>../../build/analyzers.ruleset</CodeAnalysisRuleSet>
src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+1 -1
View File
@@ -763,7 +763,7 @@ namespace Tgstation.Server.Host.Components.Deployment
}
using var progressCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var progressTask = estimatedDuration.HasValue ? ProgressTask(progressReporter, estimatedDuration.Value, cancellationToken) : Task.CompletedTask;
var progressTask = estimatedDuration.HasValue ? ProgressTask(progressReporter, estimatedDuration.Value, progressCts.Token) : Task.CompletedTask;
try
{
using var byondLock = await byond.UseExecutables(null, cancellationToken).ConfigureAwait(false);