actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-13 10:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
eric sciple
2024-06-11 12:48:51 -07:00
parent d13cf5d9a8
commit a4c63ec012
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Runner.Listener/MessageListener.cs
View File

@@ -398,7 +398,15 @@ namespace GitHub.Runner.Listener
{ {
using (var cs = new CancellationTokenSource(TimeSpan.FromSeconds(30))) using (var cs = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
{ {
await _runnerServer.DeleteAgentMessageAsync(_settings.PoolId, message.MessageId, _session.SessionId, cs.Token); if (MessageUtil.IsRunServiceJob(message.MessageType))
{
var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
await _brokerServer.DeleteRunnerMessageAsync(_session.SessionId, messageRef.RunnerRequestId, cs.Token);
}
else
{
await _runnerServer.DeleteAgentMessageAsync(_settings.PoolId, message.MessageId, _session.SessionId, cs.Token);
}
} }
} }
} }

2
src/Sdk/WebApi/WebApi/BrokerHttpClient.cs
View File

@@ -141,6 +141,8 @@ namespace GitHub.Actions.RunService.WebApi
queryParams.Add("jobMessageKey", jobMessageKey); queryParams.Add("jobMessageKey", jobMessageKey);
} }
queryParams.Add("status", TaskAgentStatus.Online.ToString());
var result = await SendAsync<object>( var result = await SendAsync<object>(
new HttpMethod("DELETE"), new HttpMethod("DELETE"),
requestUri: requestUri, requestUri: requestUri,