aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org/sonarsource/scanner
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/sonarsource/scanner')
-rw-r--r--src/main/java/org/sonarsource/scanner/cli/Exit.java1
-rw-r--r--src/main/java/org/sonarsource/scanner/cli/Main.java20
-rw-r--r--src/main/java/org/sonarsource/scanner/cli/Stats.java6
3 files changed, 12 insertions, 15 deletions
diff --git a/src/main/java/org/sonarsource/scanner/cli/Exit.java b/src/main/java/org/sonarsource/scanner/cli/Exit.java
index 703d081..d265bed 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Exit.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Exit.java
@@ -23,6 +23,7 @@ class Exit {
static final int SUCCESS = 0;
static final int INTERNAL_ERROR = 1;
static final int USER_ERROR = 2;
+ static final int SCANNER_ENGINE_ERROR = 3;
void exit(int status) {
System.exit(status);
diff --git a/src/main/java/org/sonarsource/scanner/cli/Main.java b/src/main/java/org/sonarsource/scanner/cli/Main.java
index 7ec139d..df60585 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Main.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Main.java
@@ -43,7 +43,6 @@ import org.sonarsource.scanner.lib.ScannerProperties;
public class Main {
private static final Logger LOG = LoggerFactory.getLogger(Main.class);
- private static final String SEPARATOR = "------------------------------------------------------------------------";
private final Exit exit;
private final Cli cli;
private final Conf conf;
@@ -75,13 +74,18 @@ public class Main {
init(p);
try (var engine = scannerEngineBootstrapper.bootstrap()) {
logServerType(engine);
- engine.analyze((Map) p);
- displayExecutionResult(stats, "SUCCESS");
- status = Exit.SUCCESS;
+ var success = engine.analyze((Map) p);
+ if (success) {
+ displayExecutionResult(stats, "SUCCESS");
+ status = Exit.SUCCESS;
+ } else {
+ displayExecutionResult(stats, "FAILURE");
+ status = Exit.SCANNER_ENGINE_ERROR;
+ }
}
} catch (Throwable e) {
displayExecutionResult(stats, "FAILURE");
- showError("Error during SonarScanner CLI execution", e, cli.isDebugEnabled());
+ showError(e, cli.isDebugEnabled());
status = isUserError(e) ? Exit.USER_ERROR : Exit.INTERNAL_ERROR;
} finally {
exit.exit(status);
@@ -123,14 +127,12 @@ public class Main {
}
private static void displayExecutionResult(Stats stats, String resultMsg) {
- LOG.info(SEPARATOR);
LOG.info("EXECUTION {}", resultMsg);
- LOG.info(SEPARATOR);
stats.stop();
- LOG.info(SEPARATOR);
}
- private void showError(String message, Throwable e, boolean debug) {
+ private void showError(Throwable e, boolean debug) {
+ var message = "Error during SonarScanner CLI execution";
if (debug || !isUserError(e)) {
LOG.error(message, e);
} else {
diff --git a/src/main/java/org/sonarsource/scanner/cli/Stats.java b/src/main/java/org/sonarsource/scanner/cli/Stats.java
index 0d9913a..28cb88d 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Stats.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Stats.java
@@ -34,12 +34,6 @@ class Stats {
Stats stop() {
long stopTime = System.currentTimeMillis() - startTime;
LOG.atInfo().addArgument(() -> formatTime(stopTime)).log("Total time: {}");
-
- System.gc();
- Runtime r = Runtime.getRuntime();
- long mb = 1024L * 1024;
- LOG.atInfo().addArgument((r.totalMemory() - r.freeMemory()) / mb + "M/" + r.totalMemory() / mb + "M").log("Final Memory: {}");
-
return this;
}