actions/runner
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
eric sciple
2022-05-05 19:37:03 +00:00
committed by GitHub
parent 9b82c84d51
commit 0bdd5fc7d2
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Runner.Listener/Runner.cs
+16 -30
View File
@@ -463,33 +463,6 @@ namespace GitHub.Runner.Listener
} }
else if (string.Equals(message.MessageType, JobRequestMessageTypes.RunnerJobRequest, StringComparison.OrdinalIgnoreCase)) else if (string.Equals(message.MessageType, JobRequestMessageTypes.RunnerJobRequest, StringComparison.OrdinalIgnoreCase))
{ {
// var messageRef = StringUtil.ConvertFromJson<MessageRef>(message.Body);
// var client = new HttpClient();
// client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", messageRef.Token);
// var response = await client.GetAsync(messageRef.Url, token);
// if (!response.IsSuccessStatusCode)
// {
// var content = default(string);
// try
// {
// content = await response.Content.ReadAsStringAsync();
// }
// catch
// {
// }
// var error = $"HTTP {(int)response.StatusCode} {Enum.GetName(typeof(HttpStatusCode), response.StatusCode)}";
// if (!string.IsNullOrEmpty(content))
// {
// error = $"{error}: {content}";
// }
// throw new Exception(error);
// }
// var fullMessage = await response.Content.ReadAsStringAsync();
// return StringUtil.ConvertFromJson<TaskAgentMessage>(fullMessage);
if (autoUpdateInProgress || runOnceJobReceived) if (autoUpdateInProgress || runOnceJobReceived)
{ {
skipMessageDeletion = true; skipMessageDeletion = true;
@@ -497,8 +470,18 @@ namespace GitHub.Runner.Listener
} }
else else
{ {
Trace.Info($"Received job message of length {message.Body.Length} from service, with hash '{IOUtil.GetSha256Hash(message.Body)}'"); var messageRef = StringUtil.ConvertFromJson<MessageRef>(message.Body);
var jobMessage = StringUtil.ConvertFromJson<Pipelines.AgentJobRequestMessage>(message.Body);
// Create connection
var credMgr = HostContext.GetService<ICredentialManager>();
var creds = credMgr.LoadCredentials();
// todo: add retries
var runServer = HostContext.CreateService<IRunServer>();
await runServer.ConnectAsync(new Uri(messageRef.Url), creds);
var jobMessage = await runServer.GetJobMessageAsync(messageRef.ScopeId, messageRef.PlanType, messageRef.PlanGroup, messageRef.PlanId, StringUtil.ConvertToJson(messageRef.InstanceRefs, Newtonsoft.Json.Formatting.None));
// todo: Trace.Info($"Received job message of length {message.Body.Length} from service, with hash '{IOUtil.GetSha256Hash(message.Body)}'");
jobDispatcher.Run(jobMessage, runOnce); jobDispatcher.Run(jobMessage, runOnce);
if (runOnce) if (runOnce)
{ {
@@ -644,11 +627,14 @@ Examples:
[DataMember(Name = "token")] [DataMember(Name = "token")]
public string Token { get; set; } public string Token { get; set; }
[DataMember(Name = "scopeId")] [DataMember(Name = "scopeId")]
public string ScopeId { get; set; } public Guid ScopeId { get; set; }
[DataMember(Name = "planType")] [DataMember(Name = "planType")]
public string PlanType { get; set; } public string PlanType { get; set; }
[DataMember(Name = "planGroup")] [DataMember(Name = "planGroup")]
public string PlanGroup { get; set; } public string PlanGroup { get; set; }
[DataMember(Name = "planId")]
public Guid PlanId { get; set; }
[DataMember(Name = "instanceRefs")] [DataMember(Name = "instanceRefs")]
public InstanceRef[] InstanceRefs { get; set; } public InstanceRef[] InstanceRefs { get; set; }
[DataMember(Name = "labels")] [DataMember(Name = "labels")]