Merge pull request #32463 from Channyboy/32394-outputdir

Alternative resolution for resolving server output directory if `server.output.dir` is not set.

Author: Channyboy

dev/io.openliberty.microprofile.health.4.0.internal/src/io/openliberty/microprofile/health40/internal/HealthFileUtils.java

@@ -31,7 +31,45 @@ public class HealthFileUtils {
     public static File getHealthDirFile() {
 
         if (healthDirFile == null) {
-            File serverConfigDirFile = new File(System.getProperty("server.output.dir"));
+
+            String serverOutputDir = System.getProperty("server.output.dir").trim();
+
+            File serverConfigDirFile;
+
+            /*
+             * server.output.dir may not be set.
+             * Construct the directory with WLP_OUTPUT_DIR and wlp.server.name or SERVER_NAME
+             */
+            if (serverOutputDir == null || serverOutputDir.isEmpty()) {
+                String wlpOutputDirEnv = System.getenv("WLP_OUTPUT_DIR").trim();
+
+                if (wlpOutputDirEnv == null || wlpOutputDirEnv.isEmpty()) {
+                    Tr.warning(tc, "file.healthcheck.health.directory.resolution.fail.CWMMH0102W");
+                    if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
+                        Tr.debug(tc,
+                                 "The server was unable to resolve server.output.dir property nor the WLP_OUTPUT_DIR environment variable.");
+                    }
+                    return null;
+                }
+
+                String serverName = System.getProperty("wlp.server.name").trim();
+
+                if (serverName == null || serverName.isEmpty()) {
+                    serverName = System.getenv("SERVER_NAME").trim();
+                    if (serverName == null || serverName.isEmpty()) {
+                        Tr.warning(tc, "file.healthcheck.health.directory.resolution.fail.CWMMH0102W");
+                        if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
+                            Tr.debug(tc,
+                                     "The server was unable to resolve wlp.server.name property nor the SERVER_NAME environment variable.");
+                        }
+                        return null;
+                    }
+                }
+
+                serverOutputDir = wlpOutputDirEnv + System.getProperty("file.separator") + serverName;
+            }
+            serverConfigDirFile = new File(serverOutputDir);
+
             healthDirFile = new File(serverConfigDirFile, "health");
         }
 
@@ -99,6 +137,13 @@ public static File getLiveFile() {
     public static boolean isValidSystem() throws IOException {
         healthDirFile = getHealthDirFile();
 
+        /*
+         * Failed to resolve the Health directory File object. (i.e., could not resolve the path to create the path)
+         */
+        if (healthDirFile == null) {
+            return false;
+        }
+
         //Health Dir does not exist -> create and test write
         if (!healthDirFile.exists()) {
             if (!HealthFileUtils.createDirectory(healthDirFile)) {

dev/io.openliberty.microprofile.health.internal.common/resources/io/openliberty/microprofile/health/resources/Health.nlsprops

@@ -70,6 +70,9 @@ file.healthcheck.health.directory.write.fail.CWMMH0101W=CWMMH0101W: Unable to wr
 file.healthcheck.health.directory.write.fail.CWMMH0101W.explanation=The runtime requires write permissions to the /health directory to create the "live", "ready" and "started" files for the file-based health checks to function properly.
 file.healthcheck.health.directory.write.fail.CWMMH0101W.useraction=The user must identify the root cause of the permission issue.
 
+file.healthcheck.health.directory.resolution.fail.CWMMH0102W=CWMMH0102W: The runtime cannot resolve the path for the /health directory. The file-based health check function will be disabled.
+file.healthcheck.health.directory.resolution.fail.CWMMH0102W.explanation=The runtime requires the internal server.output.dir property or WLP_OUTPUT_DIR environment variable to be set to determine the location of the /health directory.
+file.healthcheck.health.directory.resolution.fail.CWMMH0102W.useraction=Ensure that the WLP_OUTPUT_DIR environment variable is properly set.
 
 file.healthcheck.file.name.conflict.CWMMH0105W=CWMMH0106W: The runtime has detected the presence of the following directory [{0}]. A file with the same name is required for the file-based health check function at this path. The file-based health check function will be disabled.
 file.healthcheck.file.name.conflict.CWMMH0105W.explanation=The file-based health checks require the creation and use of the files "live", "ready" and "started" in the /health directory. An existing directory with one of those names is already present in the /health directory which prevents the required files from being created.