diff options
author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2021-06-28 10:10:21 -0500 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2021-06-30 20:03:13 +0000 |
commit | 551db520fa153e6654e9d39bde8404aeae14f9d3 (patch) | |
tree | 80e870a75ec74fc490eebcdcbed32ca7f2839cd2 /sonar-scanner-engine | |
parent | 2b1e236fa390e079bb4277b93b2dc9be25a77c5b (diff) | |
download | sonarqube-551db520fa153e6654e9d39bde8404aeae14f9d3.tar.gz sonarqube-551db520fa153e6654e9d39bde8404aeae14f9d3.zip |
SONAR-14917 Misleading memory amounts displayed in Administration > System
Diffstat (limited to 'sonar-scanner-engine')
-rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java index f15f4d03f08..f5a6e50b33e 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java @@ -58,6 +58,7 @@ import static java.net.URLEncoder.encode; import static org.apache.commons.lang.StringUtils.EMPTY; import static org.apache.commons.lang.StringUtils.isBlank; import static org.sonar.core.util.FileUtils.deleteQuietly; +import static org.sonar.core.util.FileUtils.humanReadableByteCountSI; import static org.sonar.scanner.scan.branch.BranchType.PULL_REQUEST; public class ReportPublisher implements Startable { @@ -162,13 +163,13 @@ public class ReportPublisher implements Startable { publisher.publish(writer); } long stopTime = System.currentTimeMillis(); - LOG.info("Analysis report generated in {}ms, dir size={}", stopTime - startTime, FileUtils.byteCountToDisplaySize(FileUtils.sizeOfDirectory(reportDir.toFile()))); + LOG.info("Analysis report generated in {}ms, dir size={}", stopTime - startTime, humanReadableByteCountSI(FileUtils.sizeOfDirectory(reportDir.toFile()))); startTime = System.currentTimeMillis(); File reportZip = temp.newFile("scanner-report", ".zip"); ZipUtils.zipDir(reportDir.toFile(), reportZip); stopTime = System.currentTimeMillis(); - LOG.info("Analysis report compressed in {}ms, zip size={}", stopTime - startTime, FileUtils.byteCountToDisplaySize(FileUtils.sizeOf(reportZip))); + LOG.info("Analysis report compressed in {}ms, zip size={}", stopTime - startTime, humanReadableByteCountSI(FileUtils.sizeOf(reportZip))); return reportZip; } catch (IOException e) { throw new IllegalStateException("Unable to prepare analysis report", e); |