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

send runner info on getNextMessage

Browse Source
This commit is contained in:
eric sciple
2022-04-09 20:04:55 +00:00
committed by GitHub
parent 25f6cc100f
commit 332b8f9240
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Runner.Common/BrokerServer.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using GitHub.DistributedTask.WebApi;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using GitHub.Runner.Common.Util; using GitHub.Runner.Common.Util;
@@ -15,7 +16,7 @@ namespace GitHub.Runner.Common
public interface IBrokerServer : IRunnerService public interface IBrokerServer : IRunnerService
{ {
Task ConnectAsync(Uri serverUrl, CancellationToken cancellationToken); Task ConnectAsync(Uri serverUrl, CancellationToken cancellationToken);
Task<string> GetMessageAsync(int poolId, Guid sessionId, long? lastMessageId, CancellationToken cancellationToken); Task<string> GetMessageAsync(TaskAgentSession session, RunnerSettings settings, long? lastMessageId, CancellationToken cancellationToken);
} }
public sealed class BrokerServer : RunnerService, IBrokerServer public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -30,9 +31,9 @@ namespace GitHub.Runner.Common
await _httpClient.GetAsync("health", cancellationToken); await _httpClient.GetAsync("health", cancellationToken);
} }
public async Task<string> GetMessageAsync(int poolId, Guid sessionId, long? lastMessageId, CancellationToken cancellationToken) public async Task<string> GetMessageAsync(TaskAgentSession session, RunnerSettings settings, long? lastMessageId, CancellationToken cancellationToken)
{ {
var response = await _httpClient.GetAsync("message", cancellationToken); var response = await _httpClient.GetAsync($"message?tenant=org:github&root_tenant=org:github&group_id={settings.PoolId}&group_name={settings.PoolName}&runner_id={settings.AgentId}&runner_name={settings.AgentName}&labels=self-hosted,linux", cancellationToken);
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
{ {
var content = default(string); var content = default(string);

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

@@ -225,7 +225,7 @@ namespace GitHub.Runner.Listener
string message = null; string message = null;
try try
{ {
message = await _brokerServer.GetMessageAsync(_settings.PoolId, _session.SessionId, null/*_lastMessageId*/, token); message = await _brokerServer.GetMessageAsync(_session, _settings, null/*_lastMessageId*/, token);
_term.WriteLine($"{DateTime.UtcNow:u}: {message}"); _term.WriteLine($"{DateTime.UtcNow:u}: {message}");
if (message != null) if (message != null)