Support harvester log in subdirectory (geonetwork#9087)

* Support harvester log in subdirectory

* Add tests

* Fix test

* Fallback to base file name

* Fix unnessary change

Author: tylerjmchugh

core/src/main/java/org/fao/geonet/util/LogUtil.java

@@ -24,14 +24,22 @@
 package org.fao.geonet.util;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.appender.routing.RoutingAppender;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Node;
 import org.fao.geonet.ApplicationContextHolder;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.kernel.setting.Settings;
+import org.fao.geonet.utils.Log;
 
+import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
+import java.nio.file.Path;
 
 public class LogUtil {
 
@@ -74,6 +82,46 @@ public static String initializeHarvesterLog(String type, String name) {
         ThreadContext.put("logfile", logfile);
         ThreadContext.put("timeZone", timeZoneSetting);
 
-        return logfile;
+        try {
+            return getHarvesterLogfilePath();
+        } catch (Exception e) {
+            Log.error("Error retrieving harvester logfile path. Defaulting to base file name.", e);
+            return logfile;
+        }
+    }
+
+    /**
+     * Retrieves the path to the current harvester logfile based on Log4J configuration.
+     *
+     * @return the path to the harvester logfile
+     */
+    public static String getHarvesterLogfilePath() {
+        // Get the top-level log directory
+        Path logDir = Paths.get(Log.getLogfile().getParent());
+
+        // Access Log4J configuration
+        LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+        Configuration config = ctx.getConfiguration();
+
+        // Get the Routing appender
+        RoutingAppender routing = config.getAppender("Harvester");
+        if (routing == null) {
+            throw new IllegalStateException("Routing appender 'Harvester' not found");
+        }
+
+        // Find the first <File> node
+        Node fileNode = routing.getRoutes().getRoutes()[0]
+            .getNode()
+            .getChildren()
+            .stream()
+            .filter(n -> "File".equalsIgnoreCase(n.getName()))
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("No <File> node found in Harvester routes"));
+
+        // Resolve the full path using the StrSubstitutor
+        Path fullPath = Paths.get(config.getStrSubstitutor().replace(fileNode.getAttributes().get("fileName")));
+
+        // Return the path relative to the log directory
+        return logDir.relativize(fullPath).toString();
     }
 }

core/src/test/java/org/fao/geonet/util/LogUtilTest.java

@@ -0,0 +1,24 @@
+package org.fao.geonet.util;
+
+import org.apache.logging.log4j.ThreadContext;
+import org.fao.geonet.utils.Log;
+import org.junit.Test;
+import org.mockito.MockedStatic;
+
+import java.nio.file.Paths;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
+
+public class LogUtilTest {
+
+    @Test
+    public void retrievesHarvesterLogfilePath() {
+        ThreadContext.put("logfile", "harvester_geonetwork40_TestHarvester_20251030083002.log");
+        try (MockedStatic<Log> logMock = mockStatic(Log.class)) {
+            logMock.when(Log::getLogfile).thenReturn(Paths.get("logs/mock.log").toFile());
+
+            assertEquals("harvester_geonetwork40_TestHarvester_20251030083002.log", LogUtil.getHarvesterLogfilePath());
+        }
+    }
+}

domain/src/test/resources/log4j2.xml

@@ -1,9 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="warn" dest="out">
+    <Properties>
+      <Property name="logs_dir">logs</Property>
+    </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%date{HH:mm:ss.SSS} %-6level [%logger{2}] - %msg%n"/>
         </Console>
+        <Routing name="Harvester">
+          <Routes pattern="$${ctx:logfile}">
+            <!-- value dynamically determines the name of the log file. -->
+            <Route>
+              <File name="harvester-${ctx:harvester}" fileName="${sys:log_dir:-${logs_dir}}/${ctx:logfile:-harvester_default.log}">
+                <PatternLayout>
+                  <pattern>%date{ISO8601}{${ctx:timeZone}} %-5level [%logger] - %message%n</pattern>
+                </PatternLayout>
+              </File>
+            </Route>
+          </Routes>
+        </Routing>
     </Appenders>
     <Loggers>
         <Logger name="org.springframework.aop.framework.CglibAopProxy" level="error"/>