diff --git a/src/Runner.Common/RunnerServer.cs b/src/Runner.Common/RunnerServer.cs index 4452e36b5..169c8b484 100644 --- a/src/Runner.Common/RunnerServer.cs +++ b/src/Runner.Common/RunnerServer.cs @@ -252,48 +252,48 @@ namespace GitHub.Runner.Common public Task> GetAgentPoolsAsync(string agentPoolName = null, TaskAgentPoolType poolType = TaskAgentPoolType.Automation) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetAgentPoolsAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.GetAgentPoolsAsync(agentPoolName, poolType: poolType); } public Task AddAgentAsync(Int32 agentPoolId, TaskAgent agent) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.AddAgentAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.AddAgentAsync(agentPoolId, agent); } public Task> GetAgentsAsync(int agentPoolId, string agentName = null) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetAgentsAsync 1"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.GetAgentsAsync(agentPoolId, agentName, false); } public Task> GetAgentsAsync(string agentName) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetAgentsAsync 2"); return GetAgentsAsync(0, agentName); // search in all all agentPools } public Task ReplaceAgentAsync(int agentPoolId, TaskAgent agent) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.ReplaceAgentAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.ReplaceAgentAsync(agentPoolId, agent); } public Task DeleteAgentAsync(int agentPoolId, int agentId) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.DeleteAgentAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.DeleteAgentAsync(agentPoolId, agentId); } public Task DeleteAgentAsync(int agentId) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.DeleteAgentAsync"); return DeleteAgentAsync(0, agentId); // agentPool is ignored server side } @@ -310,21 +310,21 @@ namespace GitHub.Runner.Common public Task DeleteAgentMessageAsync(Int32 poolId, Int64 messageId, Guid sessionId, CancellationToken cancellationToken) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.DeleteAgentMessageAsync"); CheckConnection(RunnerConnectionType.MessageQueue); return _messageTaskAgentClient.DeleteMessageAsync(poolId, messageId, sessionId, cancellationToken: cancellationToken); } public Task DeleteAgentSessionAsync(Int32 poolId, Guid sessionId, CancellationToken cancellationToken) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.DeleteAgentSessionAsync"); CheckConnection(RunnerConnectionType.MessageQueue); return _messageTaskAgentClient.DeleteAgentSessionAsync(poolId, sessionId, cancellationToken: cancellationToken); } public Task GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, CancellationToken cancellationToken) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetAgentMessageAsync"); CheckConnection(RunnerConnectionType.MessageQueue); return _messageTaskAgentClient.GetMessageAsync(poolId, sessionId, lastMessageId, cancellationToken: cancellationToken); } @@ -335,21 +335,21 @@ namespace GitHub.Runner.Common public Task RenewAgentRequestAsync(int poolId, long requestId, Guid lockToken, string orchestrationId = null, CancellationToken cancellationToken = default(CancellationToken)) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.RenewAgentRequestAsync"); CheckConnection(RunnerConnectionType.JobRequest); return _requestTaskAgentClient.RenewAgentRequestAsync(poolId, requestId, lockToken, orchestrationId: orchestrationId, cancellationToken: cancellationToken); } public Task FinishAgentRequestAsync(int poolId, long requestId, Guid lockToken, DateTime finishTime, TaskResult result, CancellationToken cancellationToken = default(CancellationToken)) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.FinishAgentRequestAsync"); CheckConnection(RunnerConnectionType.JobRequest); return _requestTaskAgentClient.FinishAgentRequestAsync(poolId, requestId, lockToken, finishTime, result, cancellationToken: cancellationToken); } public Task GetAgentRequestAsync(int poolId, long requestId, CancellationToken cancellationToken = default(CancellationToken)) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetAgentRequestAsync"); CheckConnection(RunnerConnectionType.JobRequest); return _requestTaskAgentClient.GetAgentRequestAsync(poolId, requestId, cancellationToken: cancellationToken); } @@ -359,21 +359,21 @@ namespace GitHub.Runner.Common //----------------------------------------------------------------- public Task> GetPackagesAsync(string packageType, string platform, int top, bool includeToken, CancellationToken cancellationToken) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetPackagesAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.GetPackagesAsync(packageType, platform, top, includeToken, cancellationToken: cancellationToken); } public Task GetPackageAsync(string packageType, string platform, string version, bool includeToken, CancellationToken cancellationToken) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.GetPackageAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.GetPackageAsync(packageType, platform, version, includeToken, cancellationToken: cancellationToken); } public Task UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState, string trace) { - System.Console.WriteLine("RunnerServer.qqq"); + System.Console.WriteLine("RunnerServer.UpdateAgentUpdateStateAsync"); CheckConnection(RunnerConnectionType.Generic); return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState, trace); } diff --git a/src/Sdk/Common/Common/VssHttpMessageHandler.cs b/src/Sdk/Common/Common/VssHttpMessageHandler.cs index bf38f6782..10e250cd3 100644 --- a/src/Sdk/Common/Common/VssHttpMessageHandler.cs +++ b/src/Sdk/Common/Common/VssHttpMessageHandler.cs @@ -249,7 +249,7 @@ namespace GitHub.Services.Common } else { - System.Console.WriteLine("VssHttpMessageHandler.SendAsync: Auth challenge"); + System.Console.WriteLine($"VssHttpMessageHandler.SendAsync: Auth challenge. Response status code {response.StatusCode}; headers {response.Headers}"); // In the case of a Windows token, only apply it to the web proxy if it // returned a 407 Proxy Authentication Required. If we didn't get this // status code back, then the proxy (if there is one) is clearly working fine, @@ -491,8 +491,8 @@ namespace GitHub.Services.Common HttpClientHandler httpClientHandler = handler as HttpClientHandler; if (httpClientHandler != null) { - System.Console.WriteLine($"VssHttpMessageHandler.ApplySettings: Default credentials = {defaultCredentials}"); - httpClientHandler.AllowAutoRedirect = settings.AllowAutoRedirect; + System.Console.WriteLine($"VssHttpMessageHandler.ApplySettings: Default credentials = {defaultCredentials} AllowAutoRedirect = {settings.AllowAutoRedirect}"); + httpClientHandler.AllowAutoRedirect = true; //settings.AllowAutoRedirect; httpClientHandler.ClientCertificateOptions = ClientCertificateOption.Manual; //Setting httpClientHandler.UseDefaultCredentials to false in .Net Core, clears httpClientHandler.Credentials if //credentials is already set to defaultcredentials. Therefore httpClientHandler.Credentials must be diff --git a/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs b/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs index 10fef2298..6a4be0676 100644 --- a/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs +++ b/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs @@ -881,6 +881,7 @@ namespace GitHub.Services.WebApi [Obsolete("Use VssHttpClientBase.HandleResponseAsync instead")] protected virtual void HandleResponse(HttpResponseMessage response) { + System.Console.WriteLine("VssHttpClientBase.HandleResponse 1"); } @@ -888,6 +889,7 @@ namespace GitHub.Services.WebApi HttpResponseMessage response, CancellationToken cancellationToken) { + System.Console.WriteLine($"VssHttpClientBase.HandleResponse 2 status code {response.StatusCode} headers {response.Headers}"); response.Trace(); VssHttpEventSource.Log.HttpRequestStop(VssTraceActivity.Current, response); @@ -899,6 +901,7 @@ namespace GitHub.Services.WebApi } else if (ShouldThrowError(response)) { + System.Console.WriteLine("VssHttpClientBase.HandleResponse: Should throw error"); Exception exToThrow = null; if (IsJsonResponse(response)) { @@ -922,6 +925,7 @@ namespace GitHub.Services.WebApi { message = response.ReasonPhrase; } + System.Console.WriteLine($"VssHttpClientBase.HandleResponse: Exception message {message}"); exToThrow = new VssServiceResponseException(response.StatusCode, message, exToThrow); }