✨ update --fork startup option implementation with Process API

ujibang · ujibang · commit a0559cb781f0 · 2025-04-03T09:58:27.000+02:00
#548
diff --git a/core/pom.xml b/core/pom.xml
@@ -37,17 +37,6 @@
       <groupId>org.restheart</groupId>
       <artifactId>restheart-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.kohsuke</groupId>
-      <artifactId>akuma</artifactId>
-      <!-- Will be removed due to https://github.com/SoftInstigate/restheart/issues/548
-           When done, also remove <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access> in maven-jar-plugin configuration
-      -->
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
@@ -192,8 +181,6 @@
             </manifest>
             <manifestEntries>
               <Build-Time>${maven.build.timestamp}</Build-Time>
-              <!-- akuma required JNA that logs warnings with Java 24. The following avoids it: -->
-              <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/core/src/main/java/org/restheart/Bootstrapper.java b/core/src/main/java/org/restheart/Bootstrapper.java
@@ -247,7 +247,7 @@ private static void run() {
                 System.exit(-1);
             }
 
-            // RHSecDaemon only works on POSIX OSes
+            // RESTHeartDaemon only works on POSIX OSes
             final boolean isPosix = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
 
             if (!isPosix) {
@@ -257,7 +257,6 @@ private static void run() {
             var d = new RESTHeartDaemon();
             if (d.isDaemonized()) {
                 try {
-                    d.init();
                     initLogging(configuration, d, IS_FORKED);
                 } catch (Exception t) {
                     logErrorAndExit("Error staring forked process", t, false, false, -1);
@@ -827,10 +826,6 @@ private static void plugProxies(final Configuration conf, final Set<PluginRecord
      * plug the static resources specified in the configuration file
      *
      * @param conf
-     * @param pathHandler
-     * @param authenticationMechanism
-     * @param identityManager
-     * @param accessManager
      */
     private static void plugStaticResourcesHandlers(final Configuration conf) {
         if (conf.getStaticResources() == null || conf.getStaticResources().isEmpty()) {
diff --git a/core/src/main/java/org/restheart/Shutdowner.java b/core/src/main/java/org/restheart/Shutdowner.java
@@ -20,7 +20,7 @@
  */
 package org.restheart;
 
-import com.sun.akuma.CLibrary;
+import java.io.IOException;
 import java.nio.file.Path;
 
 import org.restheart.configuration.Configuration;
@@ -80,7 +80,8 @@ protected static void shutdown(final String[] args) {
             LOGGER.info("Pid file {}", pidFilePath);
         }
 
-        CLibrary.LIBC.kill(pid, 15); // 15 is SIGTERM
+        // destroy process
+        ProcessHandle.of(pid).ifPresent(ProcessHandle::destroy);
 
         LOGGER.info("SIGTERM signal sent to RESTHeart instance with pid {} ", pid);
 
diff --git a/core/src/main/java/org/restheart/utils/FileUtils.java b/core/src/main/java/org/restheart/utils/FileUtils.java
@@ -20,7 +20,6 @@
  */
 package org.restheart.utils;
 
-import static com.sun.akuma.CLibrary.LIBC;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -129,7 +128,7 @@ public static void createPidFile(Path pidFile) {
             throw new IllegalStateException("createPidFile() is not supported on Windows.");
         }
         try (FileWriter fw = new FileWriter(pidFile.toFile())) {
-            fw.write(String.valueOf(LIBC.getpid()));
+            fw.write(String.valueOf(ProcessHandle.current().pid()));
         } catch (IOException e) {
             LOGGER.warn("error writing pid file", e);
         }
diff --git a/core/src/main/java/org/restheart/utils/RESTHeartDaemon.java b/core/src/main/java/org/restheart/utils/RESTHeartDaemon.java
@@ -20,20 +20,22 @@
  */
 package org.restheart.utils;
 
+import org.restheart.graal.ImageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+
 /**
  * utility class to help daemonizing process
  *
- * See<a href="http://akuma.kohsuke.org">Akuma</a>
  * @author Andrea Di Cesare {@literal <andrea@softinstigate.com>}
  */
-import com.sun.akuma.Daemon;
-import com.sun.akuma.JavaVMArguments;
-
-import org.restheart.graal.ImageInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RESTHeartDaemon extends Daemon {
+public class RESTHeartDaemon {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RESTHeartDaemon.class);
 
@@ -43,7 +45,6 @@ public class RESTHeartDaemon extends Daemon {
      *
      * @return
      */
-    @Override
     public boolean isDaemonized() {
         return System.getProperty(RESTHeartDaemon.class.getName()) != null;
     }
@@ -52,7 +53,6 @@ public boolean isDaemonized() {
      * Relaunches the JVM as a daemon.
      *
      */
-    @Override
     public void daemonize() {
         if (isDaemonized()) {
             throw new IllegalStateException("Already running as a daemon");
@@ -61,19 +61,43 @@ public void daemonize() {
         try {
             LOGGER.info("Forking...");
 
-            var args = JavaVMArguments.current();
-            args.setSystemProperty(RESTHeartDaemon.class.getName(), "daemonized");
+            var processInfo = ProcessHandle.current().info();
+            var __args = processInfo.arguments();
 
-            String _args[] = args.toArray(new String[0]);
+            var args = new LinkedList<>(Arrays.asList(__args.orElseGet(() -> new String[0])));
 
+            LOGGER.info("args: {}", (Object) args);
+
+            if (processInfo.command().isEmpty()) {
+                throw new IllegalStateException("Command not available");
+            }
+
+            var command = processInfo.command().get();
+
+            // add system property to identify daemon process
+            args.addFirst("-D".concat(RESTHeartDaemon.class.getName()).concat("=daemonized"));
+
+            // create child process
             if (isExecutable()) {
-                _args[0] = FileUtils.getFileAbsolutePath(_args[0]).toString();
+                args.addFirst(FileUtils.getFileAbsolutePath(command).toString());
             } else {
-                _args[0] = getCurrentExecutable();
+                args.addFirst(command);
             }
 
-            // create child process
-            var p = new ProcessBuilder().command(_args).start();
+            LOGGER.info("newArgs: {}", args);
+
+            var p = new ProcessBuilder()
+                .command(args.toArray(new String[0]))
+                .directory(new File(System.getProperty("user.dir")))
+                .inheritIO()
+                .redirectOutput(ProcessBuilder.Redirect.DISCARD)
+                .redirectError(ProcessBuilder.Redirect.DISCARD)
+                .start();
+
+            // disconnect std io
+            p.getInputStream().close();
+            p.getOutputStream().close();
+            p.getErrorStream().close();
 
             LOGGER.info("Forked process: {}", p.pid());
             // parent exists
diff --git a/core/src/main/resources/META-INF/native-image/org.restheart/restheart-core/proxy-config.json b/core/src/main/resources/META-INF/native-image/org.restheart/restheart-core/proxy-config.json
@@ -1,7 +1,4 @@
 [
-  {
-    "interfaces":["com.sun.akuma.CLibrary"]
-  },
   {
     "interfaces":["java.security.PrivilegedAction"]
   },
diff --git a/core/src/main/resources/META-INF/native-image/org.restheart/restheart-core/reflect-config.json b/core/src/main/resources/META-INF/native-image/org.restheart/restheart-core/reflect-config.json
@@ -286,13 +286,6 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
-{
-  "name":"com.sun.akuma.CLibrary",
-  "methods":[
-    {"name":"execv","parameterTypes":["java.lang.String","com.sun.jna.StringArray"] }, 
-    {"name":"readlink","parameterTypes":["java.lang.String","com.sun.jna.Memory","com.sun.jna.NativeLong"] }
-  ]
-},
 {
   "name":"com.sun.crypto.provider.AESCipher$General",
   "methods":[{"name":"<init>","parameterTypes":[] }]
diff --git a/pom.xml b/pom.xml
@@ -272,16 +272,6 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>2.0.17</version>
             </dependency>
-            <dependency>
-                <groupId>org.kohsuke</groupId>
-                <artifactId>akuma</artifactId>
-                <version>1.10</version>
-            </dependency>
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna</artifactId>
-                <version>5.16.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.fusesource.jansi</groupId>
                 <artifactId>jansi</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`[`
`2`		`- {`
`3`		`- "interfaces":["com.sun.akuma.CLibrary"]`
`4`		`- },`
`5`	`2`	`{`
`6`	`3`	`"interfaces":["java.security.PrivilegedAction"]`
`7`	`4`	`},`