From 19f435a75cf321ba7307071eedc46cca3c93dfe2 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sun, 13 Aug 2023 11:41:10 +0200 Subject: [PATCH] Minor edits. --- .../jdrupes/vmoperator/manager/Manager.java | 20 ++++++++++--------- .../vmoperator/manager/StsReconciler.java | 2 +- .../jdrupes/vmoperator/manager/VmWatcher.java | 5 ++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java index 1ee406c..e889212 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Manager.java @@ -80,11 +80,12 @@ public class Manager extends Component { */ @Handler(priority = -1000) public void onStop(Stop event) { - logger.fine(() -> "Applictaion stopped."); + logger.fine(() -> "Application stopped."); } static { try { + // Get logging properties from file and put them in effect InputStream props; var path = FsdUtils.findConfigFile(VM_OP_NAME.replace("-", ""), "logging.properties"); @@ -109,34 +110,35 @@ public class Manager extends Component { @SuppressWarnings("PMD.SignatureDeclareThrowsException") public static void main(String[] args) { try { - Logger.getLogger(Manager.class.getName()) - .fine(() -> "Version: " - + Manager.class.getPackage().getImplementationVersion()); + Logger.getLogger(Manager.class.getName()).fine(() -> "Version: " + + Manager.class.getPackage().getImplementationVersion()); + + // Parse the command line arguments CommandLineParser parser = new DefaultParser(); - // parse the command line arguments final Options options = new Options(); options.addOption(new Option("c", "config", true, "The configura" + "tion file (defaults to /etc/opt/vmoperator/config.yaml).")); CommandLine cmd = parser.parse(options, args); - // The Operator is the root component + + // The Manager is the root component app = new Manager(cmd); // Prepare Stop Runtime.getRuntime().addShutdownHook(new Thread(() -> { try { - app.fire(new Stop(), Channel.BROADCAST); + app.fire(new Stop()); Components.awaitExhaustion(); } catch (InterruptedException e) { // Cannot do anything about this. } })); - // Start application + // Start the application Components.start(app); } catch (IOException | InterruptedException | org.apache.commons.cli.ParseException e) { Logger.getLogger(Manager.class.getName()).log(Level.SEVERE, e, - () -> "Failed to start runner: " + e.getMessage()); + () -> "Failed to start manager: " + e.getMessage()); } } diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/StsReconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/StsReconciler.java index ab262a1..f4b7871 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/StsReconciler.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/StsReconciler.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; import org.jdrupes.vmoperator.manager.VmDefChanged.Type; /** - * Delegee for reconciling the pod. + * Delegee for reconciling the stateful set (effectively the pod). */ @SuppressWarnings("PMD.DataflowAnomalyAnalysis") /* default */ class StsReconciler { diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java index dfdcb30..7256e35 100644 --- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java +++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java @@ -61,8 +61,7 @@ public class VmWatcher extends Component { private ApiClient client; private String namespaceToWatch; - private final Map channels - = new ConcurrentHashMap<>(); + private final Map channels = new ConcurrentHashMap<>(); /** * Instantiates a new VM definition watcher. @@ -74,7 +73,7 @@ public class VmWatcher extends Component { } /** - * On configuration update. + * Configure the component. * * @param event the event */