mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-26 06:27:19 +01:00
Better error handling in RemoteDeploymentManagers
This commit is contained in:
+19
-12
@@ -129,9 +129,9 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
|
||||
|
||||
Logger.LogTrace("In-progress deployment status created");
|
||||
}
|
||||
catch (ApiException ex)
|
||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
||||
{
|
||||
Logger.LogWarning(ex, "Unable to create deployment!");
|
||||
Logger.LogWarning(ex, "Unable to create GitHub deployment!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -257,9 +257,9 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
|
||||
{
|
||||
await gitHubService.CommentOnIssue(remoteRepositoryOwner, remoteRepositoryName, comment, testMergeNumber, cancellationToken);
|
||||
}
|
||||
catch (ApiException e)
|
||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
||||
{
|
||||
Logger.LogWarning(e, "Error posting GitHub comment!");
|
||||
Logger.LogWarning(ex, "Error posting GitHub comment!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -342,14 +342,21 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
|
||||
|
||||
var gitHubService = gitHubServiceFactory.CreateService(gitHubAccessToken);
|
||||
|
||||
await gitHubService.CreateDeploymentStatus(
|
||||
new NewDeploymentStatus(deploymentState)
|
||||
{
|
||||
Description = description,
|
||||
},
|
||||
compileJob.GitHubRepoId.Value,
|
||||
compileJob.GitHubDeploymentId.Value,
|
||||
cancellationToken);
|
||||
try
|
||||
{
|
||||
await gitHubService.CreateDeploymentStatus(
|
||||
new NewDeploymentStatus(deploymentState)
|
||||
{
|
||||
Description = description,
|
||||
},
|
||||
compileJob.GitHubRepoId.Value,
|
||||
compileJob.GitHubDeploymentId.Value,
|
||||
cancellationToken);
|
||||
}
|
||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
||||
{
|
||||
Logger.LogWarning(ex, "Error updating GitHub deployment!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+15
-8
@@ -123,7 +123,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
|
||||
CancellationToken cancellationToken) => Task.CompletedTask;
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override Task CommentOnTestMergeSource(
|
||||
protected override async Task CommentOnTestMergeSource(
|
||||
RepositorySettings repositorySettings,
|
||||
string remoteRepositoryOwner,
|
||||
string remoteRepositoryName,
|
||||
@@ -135,13 +135,20 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
|
||||
? new GitLabClient(GitLabRemoteFeatures.GitLabUrl, repositorySettings.AccessToken)
|
||||
: new GitLabClient(GitLabRemoteFeatures.GitLabUrl);
|
||||
|
||||
return client
|
||||
.MergeRequests
|
||||
.CreateNoteAsync(
|
||||
$"{remoteRepositoryOwner}/{remoteRepositoryName}",
|
||||
testMergeNumber,
|
||||
new CreateMergeRequestNoteRequest(comment))
|
||||
.WithToken(cancellationToken);
|
||||
try
|
||||
{
|
||||
await client
|
||||
.MergeRequests
|
||||
.CreateNoteAsync(
|
||||
$"{remoteRepositoryOwner}/{remoteRepositoryName}",
|
||||
testMergeNumber,
|
||||
new CreateMergeRequestNoteRequest(comment))
|
||||
.WithToken(cancellationToken);
|
||||
}
|
||||
catch (Exception ex) when (ex is not OperationCanceledException)
|
||||
{
|
||||
Logger.LogWarning(ex, "Error posting GitHub comment!");
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
|
||||
Reference in New Issue
Block a user