You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/03/15 14:01:21 UTC
[camel] branch camel-3.20.x updated: camel-cli - Configure logging (#9544)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 735b39a595d camel-cli - Configure logging (#9544)
735b39a595d is described below
commit 735b39a595dd18a15c77a2ad5f73b65548610668
Author: Federico Mariani <34...@users.noreply.github.com>
AuthorDate: Wed Mar 15 15:01:12 2023 +0100
camel-cli - Configure logging (#9544)
---
.../org/apache/camel/dsl/jbang/core/commands/Bind.java | 4 +---
.../camel/dsl/jbang/core/commands/CamelCommand.java | 15 +++++++++++++++
.../camel/dsl/jbang/core/commands/CodeGenerator.java | 2 +-
.../camel/dsl/jbang/core/commands/CodeRestGenerator.java | 5 +----
.../apache/camel/dsl/jbang/core/commands/Complete.java | 2 +-
.../camel/dsl/jbang/core/commands/DependencyCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 3 ++-
.../org/apache/camel/dsl/jbang/core/commands/Init.java | 5 +----
.../org/apache/camel/dsl/jbang/core/commands/Pipe.java | 7 ++++++-
.../org/apache/camel/dsl/jbang/core/commands/Run.java | 7 ++++++-
.../jbang/core/commands/action/ActionWatchCommand.java | 9 +++------
.../camel/dsl/jbang/core/commands/action/CamelAction.java | 2 +-
.../dsl/jbang/core/commands/action/CamelGCAction.java | 5 +----
.../dsl/jbang/core/commands/action/CamelLogAction.java | 5 +----
.../dsl/jbang/core/commands/action/CamelReloadAction.java | 5 +----
.../jbang/core/commands/action/CamelResetStatsAction.java | 5 +----
.../dsl/jbang/core/commands/action/CamelRouteAction.java | 5 +----
.../dsl/jbang/core/commands/action/CamelSourceAction.java | 5 +----
.../dsl/jbang/core/commands/action/CamelSourceTop.java | 2 +-
.../dsl/jbang/core/commands/action/CamelThreadDump.java | 2 +-
.../dsl/jbang/core/commands/action/LoggerAction.java | 5 +----
.../jbang/core/commands/action/RouteControllerAction.java | 2 +-
.../jbang/core/commands/catalog/CatalogBaseCommand.java | 9 ++-------
.../dsl/jbang/core/commands/catalog/CatalogCommand.java | 7 ++++++-
.../camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 8 ++------
.../dsl/jbang/core/commands/catalog/CatalogKamelet.java | 5 +----
.../dsl/jbang/core/commands/config/ConfigCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/config/ConfigGet.java | 2 +-
.../camel/dsl/jbang/core/commands/config/ConfigList.java | 2 +-
.../camel/dsl/jbang/core/commands/config/ConfigSet.java | 2 +-
.../camel/dsl/jbang/core/commands/config/ConfigUnset.java | 2 +-
.../jbang/core/commands/process/CamelContextStatus.java | 2 +-
.../dsl/jbang/core/commands/process/CamelContextTop.java | 2 +-
.../camel/dsl/jbang/core/commands/process/CamelCount.java | 2 +-
.../jbang/core/commands/process/CamelProcessorStatus.java | 2 +-
.../dsl/jbang/core/commands/process/CamelRouteStatus.java | 2 +-
.../dsl/jbang/core/commands/process/CamelStatus.java | 2 +-
.../camel/dsl/jbang/core/commands/process/CamelTop.java | 2 +-
.../camel/dsl/jbang/core/commands/process/Hawtio.java | 5 +----
.../camel/dsl/jbang/core/commands/process/Jolokia.java | 5 +----
.../dsl/jbang/core/commands/process/ListBlocked.java | 2 +-
.../jbang/core/commands/process/ListCircuitBreaker.java | 2 +-
.../dsl/jbang/core/commands/process/ListEndpoint.java | 2 +-
.../camel/dsl/jbang/core/commands/process/ListEvent.java | 2 +-
.../camel/dsl/jbang/core/commands/process/ListHealth.java | 2 +-
.../dsl/jbang/core/commands/process/ListInflight.java | 2 +-
.../camel/dsl/jbang/core/commands/process/ListMetric.java | 2 +-
.../dsl/jbang/core/commands/process/ListProcess.java | 2 +-
.../dsl/jbang/core/commands/process/ListService.java | 2 +-
.../camel/dsl/jbang/core/commands/process/ListVault.java | 2 +-
.../jbang/core/commands/process/ProcessWatchCommand.java | 11 ++++-------
.../dsl/jbang/core/commands/process/StopProcess.java | 4 +---
.../dsl/jbang/core/commands/version/VersionCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/version/VersionGet.java | 2 +-
.../dsl/jbang/core/commands/version/VersionList.java | 3 +--
.../camel/dsl/jbang/core/commands/version/VersionSet.java | 2 +-
56 files changed, 93 insertions(+), 118 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index 4fbd181c6af..06e981f4f31 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -69,9 +69,7 @@ public class Bind extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
+ public Integer doCall() throws Exception {
// the kamelet binding source and sink can either be a kamelet or an uri
String in = "kamelet";
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
index 96ed6c302bb..554f962fb17 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java
@@ -57,6 +57,21 @@ public abstract class CamelCommand implements Callable<Integer> {
RuntimeUtil.configureLog("off", false, false, false, false);
}
+ protected boolean disarrangeLogging() {
+ return true;
+ }
+
+ @Override
+ public Integer call() throws Exception {
+ if (disarrangeLogging()) {
+ configureLoggingOff();
+ }
+
+ return doCall();
+ }
+
+ public abstract Integer doCall() throws Exception;
+
public File getStatusFile(String pid) {
if (camelDir == null) {
camelDir = new File(System.getProperty("user.home"), ".camel");
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
index c68057a2451..3f2d63da6e6 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeGenerator.java
@@ -26,7 +26,7 @@ public class CodeGenerator extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
new CommandLine(this).execute("--help");
return 0;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
index 3377737952f..2da2829ef68 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
@@ -67,10 +67,7 @@ public class CodeRestGenerator extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
final JsonNode node = input.endsWith("json") ? readNodeFromJson() : readNodeFromYaml();
OasDocument document = (OasDocument) Library.readDocument(node);
Configurator.setRootLevel(Level.OFF);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Complete.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Complete.java
index f23ae4c83e3..d8ca99c9ab9 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Complete.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Complete.java
@@ -29,7 +29,7 @@ public class Complete extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
String script = AutoComplete.bash(
spec.parent().name(),
spec.parent().commandLine());
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCommand.java
index e34619741ec..05708e8a240 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCommand.java
@@ -27,7 +27,7 @@ public class DependencyCommand extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
// default to list
new CommandLine(new DependencyList(getMain())).execute();
return 0;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 78e441c3dcc..6a27b527988 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -152,7 +152,8 @@ abstract class ExportBaseCommand extends CamelCommand {
super(main);
}
- public Integer call() throws Exception {
+ @Override
+ public Integer doCall() throws Exception {
// configure logging first
if (logging) {
RuntimeUtil.configureLog(loggingLevel, false, false, false, true);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 9eef178bc30..05faeec8995 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -72,10 +72,7 @@ public class Init extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
// is the file referring to an existing file on github/gist
// then we should download the file to local for use
if (file.startsWith("https://github.com/")) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
index fbc929fc7c2..0da2ed0eeb6 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
@@ -61,7 +61,12 @@ public class Pipe extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public boolean disarrangeLogging() {
+ return false;
+ }
+
+ @Override
+ public Integer doCall() throws Exception {
// remove leading ./ when calling a script in pipe mode
if (file != null && file.startsWith("./")) {
file = file.substring(2);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 817984e6b25..7dacd414f15 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -214,7 +214,12 @@ public class Run extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public boolean disarrangeLogging() {
+ return false;
+ }
+
+ @Override
+ public Integer doCall() throws Exception {
printConfigurationValues("Running integration with the following configuration:");
// run
return run();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java
index 679e442e76c..165aa2d9c6f 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/ActionWatchCommand.java
@@ -32,10 +32,7 @@ abstract class ActionWatchCommand extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
int exit;
if (watch) {
do {
@@ -46,7 +43,7 @@ abstract class ActionWatchCommand extends ActionBaseCommand {
}
} while (exit == 0);
} else {
- exit = doCall();
+ exit = doWatchCall();
}
return exit;
}
@@ -55,6 +52,6 @@ abstract class ActionWatchCommand extends ActionBaseCommand {
AnsiConsole.out().print(Ansi.ansi().eraseScreen().cursor(1, 1));
}
- protected abstract Integer doCall() throws Exception;
+ protected abstract Integer doWatchCall() throws Exception;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java
index 6a89563f074..377042e9efb 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java
@@ -28,7 +28,7 @@ public class CamelAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
new CommandLine(this).execute("--help");
return 0;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
index 01e78ff6eb7..a0ca44ab8ea 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
@@ -36,10 +36,7 @@ public class CamelGCAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
List<Long> pids = findPids(name);
for (long pid : pids) {
JsonObject root = new JsonObject();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
index e0d67a9685e..243045ab183 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
@@ -97,10 +97,7 @@ public class CamelLogAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
Map<Long, Row> rows = new LinkedHashMap<>();
// find new pids
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
index 0ab9a04b69d..64e2aba6ee4 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
@@ -36,10 +36,7 @@ public class CamelReloadAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
List<Long> pids = findPids(name);
for (long pid : pids) {
JsonObject root = new JsonObject();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
index 1cffe3cdce9..7e0751bd858 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
@@ -36,10 +36,7 @@ public class CamelResetStatsAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
List<Long> pids = findPids(name);
for (long pid : pids) {
JsonObject root = new JsonObject();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
index d24ddabe124..7a85a7be2a3 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
@@ -42,10 +42,7 @@ public abstract class CamelRouteAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
if (!all && name == null) {
return 0;
} else if (all) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
index 66d2bd2de22..ecdd9d443db 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
@@ -57,10 +57,7 @@ public class CamelSourceAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
index bda0bb38c11..b6d584a4630 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
@@ -53,7 +53,7 @@ public class CamelSourceTop extends ActionWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
index 1ee5b4c147f..6831541895e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
@@ -66,7 +66,7 @@ public class CamelThreadDump extends ActionWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
index e79dd0b9e72..2ad7eb35f5e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
@@ -61,7 +61,7 @@ public class LoggerAction extends ActionBaseCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
if (loggingLevel == null) {
return callList();
}
@@ -74,9 +74,6 @@ public class LoggerAction extends ActionBaseCommand {
}
protected Integer callChangeLoggingLevel() throws Exception {
- // configure logging first
- configureLoggingOff();
-
List<Long> pids = findPids(name);
for (long pid : pids) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
index f5e0a85acfd..8cd3a722151 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
@@ -67,7 +67,7 @@ public class RouteControllerAction extends ActionWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index 576c462279d..9bf91113c75 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -91,9 +91,6 @@ public abstract class CatalogBaseCommand extends CamelCommand {
}
CamelCatalog loadCatalog() throws Exception {
- // silent logging when download catalogs
- RuntimeUtil.configureLog("off", false, false, false, false);
-
if ("spring-boot".equals(runtime)) {
return CatalogLoader.loadSpringBootCatalog(repos, camelVersion);
} else if ("quarkus".equals(runtime)) {
@@ -107,10 +104,8 @@ public abstract class CatalogBaseCommand extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
+ this.catalog = loadCatalog();
List<Row> rows = collectRows();
if (filterName != null) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java
index ed4b0cecf2a..7c9b63bf17b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogCommand.java
@@ -29,7 +29,12 @@ public class CatalogCommand extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ protected boolean disarrangeLogging() {
+ return false;
+ }
+
+ @Override
+ public Integer doCall() throws Exception {
new CommandLine(this).execute("--help");
return 0;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index 1c0e64ebe44..6d67e58c96d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -95,9 +95,6 @@ public class CatalogDoc extends CamelCommand {
}
CamelCatalog loadCatalog() throws Exception {
- // silent logging when download catalogs
- RuntimeUtil.configureLog("off", false, false, false, false);
-
if ("spring-boot".equals(runtime)) {
return CatalogLoader.loadSpringBootCatalog(repos, camelVersion);
} else if ("quarkus".equals(runtime)) {
@@ -111,9 +108,8 @@ public class CatalogDoc extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
+ public Integer doCall() throws Exception {
+ this.catalog = loadCatalog();
String prefix = StringHelper.before(name, ":");
if (prefix != null) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index 9bdbb923be0..a306b6c99dc 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -60,10 +60,7 @@ public class CatalogKamelet extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
List<KameletModel> rows = new ArrayList<>();
Map<String, Object> kamelets;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigCommand.java
index 64d23e830ca..74f9fff7886 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigCommand.java
@@ -29,7 +29,7 @@ public class ConfigCommand extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
// defaults to list
new CommandLine(new ConfigList(getMain())).execute();
return 0;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
index 5dc07d391a2..115ffd22590 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
@@ -33,7 +33,7 @@ public class ConfigGet extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
CommandLineHelper.loadProperties(properties -> {
if (properties.containsKey(key)) {
System.out.println(properties.getProperty(key));
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java
index 717b532192e..2a94ade37d0 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java
@@ -29,7 +29,7 @@ public class ConfigList extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
CommandLineHelper
.loadProperties(p -> {
for (String k : p.stringPropertyNames()) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
index d7893c80154..fd21a22eff1 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
@@ -34,7 +34,7 @@ public class ConfigSet extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
CommandLineHelper.createPropertyFile();
if (configuration.split("=").length == 1) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
index de229b41429..6dc867d0df1 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
@@ -33,7 +33,7 @@ public class ConfigUnset extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
CommandLineHelper.loadProperties(properties -> {
properties.remove(key);
CommandLineHelper.storeProperties(properties);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
index eb87dc1f2fb..b8979442c45 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
@@ -49,7 +49,7 @@ public class CamelContextStatus extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
index ed36eb58b8e..ce7a96aa963 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
@@ -48,7 +48,7 @@ public class CamelContextTop extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java
index f43d3f6819c..b5e52161a19 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java
@@ -56,7 +56,7 @@ public class CamelCount extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
index f752d71da1d..b34cae6c901 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
@@ -61,7 +61,7 @@ public class CamelProcessorStatus extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
index 2e65d9ec7a3..e1a488c9285 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
@@ -64,7 +64,7 @@ public class CamelRouteStatus extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java
index 596cd72c7b8..d54b6811600 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java
@@ -33,7 +33,7 @@ public class CamelStatus extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
// default to get the integrations
CamelContextStatus cmd = new CamelContextStatus(getMain());
cmd.watch = watch;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java
index 5a3af05e8f3..7898cb20a8b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java
@@ -33,7 +33,7 @@ public class CamelTop extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
// default to top the integrations
CamelContextTop cmd = new CamelContextTop(getMain());
cmd.watch = watch;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index d3b1f625b7e..274823ac3d7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -57,10 +57,7 @@ public class Hawtio extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
int exit;
if (name == null) {
exit = callHawtio();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
index 06becde4b28..c5eb4cd9c59 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
@@ -43,10 +43,7 @@ public class Jolokia extends ProcessBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
List<Long> pids = findPids(name);
if (pids.isEmpty()) {
return 0;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java
index 800eba36ca3..316766293c0 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java
@@ -48,7 +48,7 @@ public class ListBlocked extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java
index 9d79ed9568e..003dd2fea12 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java
@@ -48,7 +48,7 @@ public class ListCircuitBreaker extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java
index e3205346c86..dc69b45618e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java
@@ -68,7 +68,7 @@ public class ListEndpoint extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
// make it easier to filter
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
index fca78be3c4a..2299b4ad990 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
@@ -52,7 +52,7 @@ public class ListEvent extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
index 8d69917ba7b..262315a989f 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
@@ -75,7 +75,7 @@ public class ListHealth extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
final List<Row> rows = new ArrayList<>();
// include stack-traces
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java
index 941431dce9e..094e4a9f31b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java
@@ -48,7 +48,7 @@ public class ListInflight extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java
index b69b646b1d9..440954c8260 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java
@@ -60,7 +60,7 @@ public class ListMetric extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
index 8d67cfff03b..72671c4cbc3 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
@@ -46,7 +46,7 @@ public class ListProcess extends ProcessWatchCommand {
super(main);
}
- protected Integer doCall() throws Exception {
+ protected Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids("*");
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
index 9b56a84ef15..b052df20982 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
@@ -48,7 +48,7 @@ public class ListService extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids(name);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
index 8ce83a353cb..f7355fd0ebb 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
@@ -45,7 +45,7 @@ public class ListVault extends ProcessWatchCommand {
}
@Override
- public Integer doCall() throws Exception {
+ public Integer doProcessWatchCall() throws Exception {
List<Row> rows = new ArrayList<>();
List<Long> pids = findPids("*");
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java
index e72b419c0cf..c1a3d377403 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java
@@ -35,22 +35,19 @@ abstract class ProcessWatchCommand extends ProcessBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
-
+ public Integer doCall() throws Exception {
int exit;
if (watch) {
do {
clearScreen();
- exit = doCall();
+ exit = doProcessWatchCall();
if (exit == 0) {
// use 2-sec delay in watch mode
Thread.sleep(2000);
}
} while (exit == 0);
} else {
- exit = doCall();
+ exit = doProcessWatchCall();
}
return exit;
}
@@ -59,6 +56,6 @@ abstract class ProcessWatchCommand extends ProcessBaseCommand {
AnsiConsole.out().print(Ansi.ansi().eraseScreen().cursor(1, 1));
}
- protected abstract Integer doCall() throws Exception;
+ protected abstract Integer doProcessWatchCall() throws Exception;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
index ad121e73fc9..e0136475fd1 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
@@ -43,9 +43,7 @@ public class StopProcess extends ProcessBaseCommand {
}
@Override
- public Integer call() throws Exception {
- // configure logging first
- configureLoggingOff();
+ public Integer doCall() throws Exception {
if (!all && name == null) {
return 0;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionCommand.java
index d305b45866c..ac63828bb86 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionCommand.java
@@ -29,7 +29,7 @@ public class VersionCommand extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
// defaults to get
new CommandLine(new VersionGet(getMain())).execute();
return 0;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
index 0b526941b33..35161297f54 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java
@@ -31,7 +31,7 @@ public class VersionGet extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
CamelCatalog catalog = new DefaultCamelCatalog();
String v = catalog.getCatalogVersion();
System.out.println("Camel JBang version: " + v);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
index 8cc69fa76aa..4d05cfe26f9 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
@@ -68,8 +68,7 @@ public class VersionList extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
- configureLoggingOff();
+ public Integer doCall() throws Exception {
KameletMain main = new KameletMain();
List<String[]> versions;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java
index 466cf80218d..fad31e59a1b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java
@@ -42,7 +42,7 @@ public class VersionSet extends CamelCommand {
}
@Override
- public Integer call() throws Exception {
+ public Integer doCall() throws Exception {
CommandLineHelper.createPropertyFile();
CommandLineHelper.loadProperties(properties -> {