From 7ba0916092697b936ee4a6aa40390f7fa00c7c68 Mon Sep 17 00:00:00 2001 From: JoannaaKL Date: Thu, 15 Sep 2022 19:04:13 +0000 Subject: [PATCH] Unextract the container error logs method --- src/Runner.Worker/ContainerOperationProvider.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs index 79d2190a4..45017133c 100644 --- a/src/Runner.Worker/ContainerOperationProvider.cs +++ b/src/Runner.Worker/ContainerOperationProvider.cs @@ -126,7 +126,9 @@ namespace GitHub.Runner.Worker foreach (var container in unhealthyContainers) { executionContext.Output($"##[group]Service container {container.ContainerNetworkAlias} failed."); - await ContainerErrorLogs(executionContext, container); + await _dockerManager.DockerLogs(context: executionContext, containerId: container.ContainerId); + executionContext.Error($"Failed to initialize container {container.ContainerImage}"); + container.FailedInitialization = true; executionContext.Output("##[endgroup]"); } throw new InvalidOperationException("One or more containers failed to start."); @@ -448,13 +450,6 @@ namespace GitHub.Runner.Worker return serviceHealth; } - private async Task ContainerErrorLogs(IExecutionContext executionContext, ContainerInfo container) - { - await _dockerManager.DockerLogs(context: executionContext, containerId: container.ContainerId); - executionContext.Error($"Failed to initialize container {container.ContainerImage}"); - container.FailedInitialization = true; - } - private async Task ContainerRegistryLogin(IExecutionContext executionContext, ContainerInfo container) { if (string.IsNullOrEmpty(container.RegistryAuthUsername) || string.IsNullOrEmpty(container.RegistryAuthPassword))