SONARMSBRU-152: Print the HTTP error code and the reason phrase in an error message.

Bogdan Gavril · Bogdan Gavril · commit 6dee118c90ee · 2015-10-16T13:20:34.000+01:00
diff --git a/SonarQube.MSBuild.Runner.sln b/SonarQube.MSBuild.Runner.sln
@@ -46,9 +46,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V0_9UpgradeMessageExe", "V0_9UpgradeMessageExe\V0_9UpgradeMessageExe.csproj", "{D35AF999-A91E-4DE2-93D7-858DFB4DD063}"
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
diff --git a/SonarQube.TeamBuild.Integration/CoverageReportDownloader.cs b/SonarQube.TeamBuild.Integration/CoverageReportDownloader.cs
@@ -47,9 +47,10 @@ public bool DownloadReport(string tfsUri, string reportUrl, string newFullFileNa
         private void InternalDownloadReport(string tfsUri, string reportUrl, string reportDestinationPath, ILogger logger)
         {
             VssHttpMessageHandler vssHttpMessageHandler = GetHttpHandler(tfsUri, logger);
-            HttpClient httpClient = new HttpClient(vssHttpMessageHandler);
 
             logger.LogInfo(Resources.DOWN_DIAG_DownloadCoverageReportFromTo, reportUrl, reportDestinationPath);
+
+            using (HttpClient httpClient = new HttpClient(vssHttpMessageHandler))
             using (HttpResponseMessage response = httpClient.GetAsync(reportUrl).Result)
             {
                 if (response.IsSuccessStatusCode)
@@ -59,6 +60,10 @@ private void InternalDownloadReport(string tfsUri, string reportUrl, string repo
                         response.Content.CopyToAsync(fileStream).Wait();
                     }
                 }
+                else
+                {
+                    logger.LogError(Resources.PROC_ERROR_FailedToDownloadReportReason, reportUrl, response.StatusCode, response.ReasonPhrase);
+                }
             }
         }
 
diff --git a/SonarQube.TeamBuild.Integration/Resources.Designer.cs b/SonarQube.TeamBuild.Integration/Resources.Designer.cs
diff --git a/SonarQube.TeamBuild.Integration/Resources.resx b/SonarQube.TeamBuild.Integration/Resources.resx
@@ -158,6 +158,9 @@ Check that the downloaded code coverage file ({0}) is valid by opening it in Vis
   <data name="PROC_ERROR_FailedToDownloadReport" xml:space="preserve">
     <value>Failed to download the code coverage report.</value>
   </data>
+  <data name="PROC_ERROR_FailedToDownloadReportReason" xml:space="preserve">
+    <value>"Failed to download the code coverage report from {0}. The HTTP status code was {1} and the reason \"{2}\""</value>
+  </data>
   <data name="PROC_ERROR_MultipleCodeCoverageReportsFound" xml:space="preserve">
     <value>More than one code coverage result file was created. Only one report can be uploaded to SonarQube. Please modify the build definition so either SonarQube analysis is disabled or only one platform/flavor is built</value>
   </data>

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,10 @@ public bool DownloadReport(string tfsUri, string reportUrl, string newFullFileNa`
`47`	`47`	`private void InternalDownloadReport(string tfsUri, string reportUrl, string reportDestinationPath, ILogger logger)`
`48`	`48`	`{`
`49`	`49`	`VssHttpMessageHandler vssHttpMessageHandler = GetHttpHandler(tfsUri, logger);`
`50`		`- HttpClient httpClient = new HttpClient(vssHttpMessageHandler);`
`51`	`50`
`52`	`51`	`logger.LogInfo(Resources.DOWN_DIAG_DownloadCoverageReportFromTo, reportUrl, reportDestinationPath);`
	`52`	`+`
	`53`	`+ using (HttpClient httpClient = new HttpClient(vssHttpMessageHandler))`
`53`	`54`	`using (HttpResponseMessage response = httpClient.GetAsync(reportUrl).Result)`
`54`	`55`	`{`
`55`	`56`	`if (response.IsSuccessStatusCode)`
`@@ -59,6 +60,10 @@ private void InternalDownloadReport(string tfsUri, string reportUrl, string repo`
`59`	`60`	`response.Content.CopyToAsync(fileStream).Wait();`
`60`	`61`	`}`
`61`	`62`	`}`
	`63`	`+ else`
	`64`	`+ {`
	`65`	`+ logger.LogError(Resources.PROC_ERROR_FailedToDownloadReportReason, reportUrl, response.StatusCode, response.ReasonPhrase);`
	`66`	`+ }`
`62`	`67`	`}`
`63`	`68`	`}`
`64`	`69`