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 e62461904b4 CAMEL-19067: camel-jbang - Commands should not use log4j
logging by default - only for special commands like run/pipe/export. This
caused problems for windows users.
e62461904b4 is described below
commit e62461904b418fbfc9d4c304f8f7801dcc0b454b
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Feb 17 09:32:52 2023 +0100
CAMEL-19067: camel-jbang - Commands should not use log4j logging by default
- only for special commands like run/pipe/export. This caused problems for
windows users.
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java | 3 +++
.../java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java | 5 +++++
.../org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java | 3 +++
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 2 ++
.../camel/dsl/jbang/core/commands/action/ActionWatchCommand.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java | 3 +++
.../camel/dsl/jbang/core/commands/action/CamelReloadAction.java | 3 +++
.../camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java | 3 +++
.../camel/dsl/jbang/core/commands/action/CamelRouteAction.java | 3 +++
.../camel/dsl/jbang/core/commands/action/CamelSourceAction.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/action/LoggerAction.java | 3 +++
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java | 3 +++
.../camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/process/StopProcess.java | 3 +++
19 files changed, 58 insertions(+)
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 6741b8019f9..6ab96f549f2 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
@@ -70,6 +70,9 @@ class Bind extends CamelCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
// the kamelet binding source and sink can either be a kamelet or an
uri
String in = "kamelet";
String out = "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 ef5e1b44b67..4aa13a6bfa4 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
@@ -20,6 +20,7 @@ import java.io.File;
import java.util.Stack;
import java.util.concurrent.Callable;
+import org.apache.camel.dsl.jbang.core.common.RuntimeUtil;
import picocli.CommandLine;
import picocli.CommandLine.IParameterConsumer;
import picocli.CommandLine.Model.ArgSpec;
@@ -47,6 +48,10 @@ public abstract class CamelCommand implements
Callable<Integer> {
return main;
}
+ protected void configureLoggingOff() {
+ RuntimeUtil.configureLog("off", false, false, false, false);
+ }
+
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/CodeRestGenerator.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
index 41787ebfe36..3377737952f 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
@@ -68,6 +68,9 @@ public class CodeRestGenerator extends CamelCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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/Init.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 1d3ce0d93e4..69172f56d89 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
@@ -73,6 +73,8 @@ class Init extends CamelCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
// is the file referring to an existing file on github/gist
// then we should download the file to local for use
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 8fbd5421db5..679e442e76c 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
@@ -33,6 +33,9 @@ abstract class ActionWatchCommand extends ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
int exit;
if (watch) {
do {
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 8a81565392a..01e78ff6eb7 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
@@ -37,6 +37,9 @@ public class CamelGCAction extends ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 4eee515eb80..e0d67a9685e 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
@@ -98,6 +98,9 @@ public class CamelLogAction extends ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 b62933a8f83..0ab9a04b69d 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
@@ -37,6 +37,9 @@ public class CamelReloadAction extends ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 34a00c1414a..1cffe3cdce9 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
@@ -37,6 +37,9 @@ public class CamelResetStatsAction extends ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 df875a1c08e..d24ddabe124 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
@@ -43,6 +43,9 @@ public abstract class CamelRouteAction extends
ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 b3ef1f5c4ea..66d2bd2de22 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
@@ -58,6 +58,9 @@ public class CamelSourceAction extends ActionBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 531a4670d47..e79dd0b9e72 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
@@ -74,6 +74,9 @@ 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/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index 5cb43bfe1ae..a5f9a9e0d30 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
@@ -69,6 +69,9 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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/CatalogDoc.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index 33297b470f2..cd849c62397 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
@@ -81,6 +81,9 @@ public class CatalogDoc extends CamelCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
String prefix = StringHelper.before(name, ":");
if (prefix != null) {
name = StringHelper.after(name, ":");
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 bf8af192b3c..4a68cfa898c 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
@@ -61,6 +61,9 @@ public class CatalogKamelet extends CamelCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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/process/Hawtio.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index 8d9e1dcd1ff..d3b1f625b7e 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
@@ -58,6 +58,9 @@ public class Hawtio extends CamelCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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 5a278726f4a..06becde4b28 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
@@ -44,6 +44,9 @@ public class Jolokia extends ProcessBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
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/ProcessWatchCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessWatchCommand.java
index cb8c6dbb560..e72b419c0cf 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
@@ -36,6 +36,9 @@ abstract class ProcessWatchCommand extends ProcessBaseCommand
{
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
int exit;
if (watch) {
do {
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 2d3eb07691f..ad121e73fc9 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
@@ -44,6 +44,9 @@ public class StopProcess extends ProcessBaseCommand {
@Override
public Integer call() throws Exception {
+ // configure logging first
+ configureLoggingOff();
+
if (!all && name == null) {
return 0;
} else if (all) {
