diff --git a/org.jdrupes.vmoperator.runner.qemu/helm-test/templates/etcConfig.yaml b/org.jdrupes.vmoperator.runner.qemu/helm-test/templates/etcConfig.yaml index 3119fbe..6759d92 100644 --- a/org.jdrupes.vmoperator.runner.qemu/helm-test/templates/etcConfig.yaml +++ b/org.jdrupes.vmoperator.runner.qemu/helm-test/templates/etcConfig.yaml @@ -117,3 +117,16 @@ data: "spice": "port": {{ .Values.vm.spicePort }} # "usbRedirects": 2 + + logging.properties: | + handlers=java.util.logging.ConsoleHandler + + #org.jgrapes.level=FINE + #org.jgrapes.core.handlerTracking.level=FINER + + org.jdrupes.vmoperator.runner.qemu.level=FINE + + java.util.logging.ConsoleHandler.level=ALL + java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter + java.util.logging.SimpleFormatter.format=%1$tb %1$td %1$tT %4$s %5$s%6$s%n + \ No newline at end of file diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java index db3a34b..bffcb8a 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java @@ -200,7 +200,7 @@ public class Runner extends Component { attach(new SocketConnector(channel())); attach(qemuMonitor = new QemuMonitor(channel())); - // Configuration store with file in /etc (default) + // Configuration store with file in /etc/opt (default) File config = new File(cmdLine.getOptionValue('c', "/etc/opt/" + APP_NAME + "/config.yaml")); // Don't rely on night config to produce a good exception diff --git a/org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/FsdUtils.java b/org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/FsdUtils.java index 8789f50..175749d 100644 --- a/org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/FsdUtils.java +++ b/org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/FsdUtils.java @@ -146,6 +146,7 @@ public class FsdUtils { * * 1. the current working directory, * 1. the {@link #configHome(String)} + * 1. the subdirectory `appName` of `/etc/opt` * 1. the subdirectory `appName` of `/etc` * * @param appName the application name @@ -156,6 +157,7 @@ public class FsdUtils { String filename) { var candidates = List.of(Path.of(filename), configHome(appName).resolve(filename), + Path.of("/etc").resolve("opt").resolve(appName).resolve(filename), Path.of("/etc").resolve(appName).resolve(filename)); for (var candidate : candidates) { if (Files.exists(candidate)) {