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/08/30 10:54:14 UTC

[camel] branch main updated: CAMEL-18406: camel-jbang - Add gc command

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


The following commit(s) were added to refs/heads/main by this push:
     new 1edd67e28a2 CAMEL-18406: camel-jbang - Add gc command
1edd67e28a2 is described below

commit 1edd67e28a2c7618004debad92f51e45fd26efa2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 30 12:53:58 2022 +0200

    CAMEL-18406: camel-jbang - Add gc command
---
 .../camel/cli/connector/LocalCliConnector.java     |  2 +
 .../dsl/jbang/core/commands/CamelJBangMain.java    |  4 +-
 .../jbang/core/commands/action/CamelGCAction.java  | 51 ++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index 541d2e716c6..ea28a956bed 100644
--- a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++ b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -225,6 +225,8 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
                         // ignore
                     }
                 }
+            } else if ("gc".equals(action)) {
+                System.gc();
             }
 
             // action done so delete file
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 65b10637e28..88577458c83 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Callable;
 import org.apache.camel.catalog.CamelCatalog;
 import org.apache.camel.catalog.DefaultCamelCatalog;
 import org.apache.camel.dsl.jbang.core.commands.action.CamelAction;
+import org.apache.camel.dsl.jbang.core.commands.action.CamelGCAction;
 import org.apache.camel.dsl.jbang.core.commands.action.CamelRouteStartAction;
 import org.apache.camel.dsl.jbang.core.commands.action.CamelRouteStopAction;
 import org.apache.camel.dsl.jbang.core.commands.process.CamelContextStatus;
@@ -55,7 +56,8 @@ public class CamelJBangMain implements Callable<Integer> {
                         .addSubcommand("route", new CommandLine(new CamelRouteTop(main))))
                 .addSubcommand("cmd", new CommandLine(new CamelAction(main))
                         .addSubcommand("start-route", new CommandLine(new CamelRouteStartAction(main)))
-                        .addSubcommand("stop-route", new CommandLine(new CamelRouteStopAction(main))))
+                        .addSubcommand("stop-route", new CommandLine(new CamelRouteStopAction(main)))
+                        .addSubcommand("gc", new CommandLine(new CamelGCAction(main))))
                 .addSubcommand("generate", new CommandLine(new CodeGenerator(main))
                         .addSubcommand("rest", new CommandLine(new CodeRestGenerator(main))))
                 .addSubcommand("jolokia", new CommandLine(new Jolokia(main)))
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
new file mode 100644
index 00000000000..8a81565392a
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dsl.jbang.core.commands.action;
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.json.JsonObject;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "gc",
+                     description = "Trigger Java Memory Garbage Collector")
+public class CamelGCAction extends ActionBaseCommand {
+
+    @CommandLine.Parameters(description = "Name or pid of running Camel integration. (default selects all)", arity = "0..1")
+    String name = "*";
+
+    public CamelGCAction(CamelJBangMain main) {
+        super(main);
+    }
+
+    @Override
+    public Integer call() throws Exception {
+        List<Long> pids = findPids(name);
+        for (long pid : pids) {
+            JsonObject root = new JsonObject();
+            root.put("action", "gc");
+            File f = getActionFile("" + pid);
+            IOHelper.writeText(root.toJson(), f);
+        }
+
+        return 0;
+    }
+
+}