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 2022/10/24 08:38:33 UTC
[camel] branch main updated (8fa8064418c -> 442b1126c35)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 8fa8064418c (chores) camel-aws2-kinesis: disable flaky test on Github
new fe7be06b39e Polished
new 442b1126c35 CAMEL-18630: camel-jbang - Add get health command
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/dsl/jbang/core/commands/process/ListHealth.java | 10 +++++++++-
.../main/java/org/apache/camel/main/http/VertxHttpServer.java | 2 --
2 files changed, 9 insertions(+), 3 deletions(-)
[camel] 01/02: Polished
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe7be06b39e5c46145a0160801a5d95cd42b8014
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 24 10:26:39 2022 +0200
Polished
---
.../src/main/java/org/apache/camel/main/http/VertxHttpServer.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/http/VertxHttpServer.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/http/VertxHttpServer.java
index 0d10807095a..22b4274be90 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/http/VertxHttpServer.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/http/VertxHttpServer.java
@@ -394,8 +394,6 @@ public final class VertxHttpServer {
}
}
sb.append(" ]\n");
- } else {
- sb.append("\n");
}
}
[camel] 02/02: CAMEL-18630: camel-jbang - Add get health command
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 442b1126c35d447ffd1338441e179624bb7424f2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 24 10:38:00 2022 +0200
CAMEL-18630: camel-jbang - Add get health command
---
.../camel/dsl/jbang/core/commands/process/ListHealth.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
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 e42979a0569..d5a99651668 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
@@ -41,7 +41,7 @@ public class ListHealth extends ProcessBaseCommand {
String sort;
@CommandLine.Option(names = { "--level" },
- description = "Level of details: full, oneline, or default", defaultValue = "default")
+ description = "Level of details: full, or default", defaultValue = "default")
String level;
@CommandLine.Option(names = { "--down" },
@@ -144,6 +144,14 @@ public class ListHealth extends ProcessBaseCommand {
if (down && !row.state.equals("DOWN")) {
add = false;
}
+ if (level == null || "default".equals(level)) {
+ if (row.state.equals("UP") && "camel".equals(row.group)
+ && (row.id.startsWith("route:") || row.id.startsWith("consumer:"))) {
+ // skip camel/route: camel/consumer: checks when they are UP
+ // as they are less relevant and is verbose
+ add = false;
+ }
+ }
if (add) {
rows.add(row);
}