mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Add some logging messages and enhance logging configurability.

Browse source
This commit is contained in:
Michael Lipp 2024-11-12 19:29:46 +00:00
parent b8aa925a49
commit 12d6745d75
6 changed files with 67 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CommandDefinition.java
View file

@ -69,4 +69,9 @@ class CommandDefinition {
public String name() {
return name;
}
@Override
public String toString() {
return "Command " + name + ": " + command;
}
}

18
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
View file

@ -48,6 +48,8 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
@ -318,6 +320,7 @@ public class Runner extends Component {
});
}
@SuppressWarnings("PMD.LambdaCanBeMethodReference")
private void processInitialConfiguration(Configuration newConfig) {
try {
config = newConfig;
@ -333,12 +336,15 @@ public class Runner extends Component {
var tplData = dataFromTemplate();
swtpmDefinition = Optional.ofNullable(tplData.get(SWTPM))
.map(d -> new CommandDefinition(SWTPM, d)).orElse(null);
logger.finest(() -> swtpmDefinition.toString());
qemuDefinition = Optional.ofNullable(tplData.get(QEMU))
.map(d -> new CommandDefinition(QEMU, d)).orElse(null);
logger.finest(() -> qemuDefinition.toString());
cloudInitImgDefinition
= Optional.ofNullable(tplData.get(CLOUD_INIT_IMG))
.map(d -> new CommandDefinition(CLOUD_INIT_IMG, d))
.orElse(null);
logger.finest(() -> cloudInitImgDefinition.toString());
// Forward some values to child components
qemuMonitor.configure(config.monitorSocket,
@ -364,6 +370,12 @@ public class Runner extends Component {
break;
}
}
if (codePaths.iterator().hasNext() && config.firmwareRom == null) {
throw new IllegalArgumentException("No ROM found, candidates were: "
+ StreamSupport.stream(codePaths.spliterator(), false)
.map(JsonNode::asText).collect(Collectors.joining(", ")));
}
// Get file for firmware vars, if necessary
config.firmwareVars = config.dataDir.resolve(FW_VARS);
if (!Files.exists(config.firmwareVars)) {
@ -405,12 +417,14 @@ public class Runner extends Component {
model.put("hasDisplayPassword", config.hasDisplayPassword);
model.put("cloudInit", config.cloudInit);
model.put("vm", config.vm);
logger.finest(() -> "Processing template with model: " + model);
// Combine template and data and parse result
// (tempting, but no need to use a pipe here)
var fmTemplate = fmConfig.getTemplate(templatePath.toString());
StringWriter out = new StringWriter();
fmTemplate.process(model, out);
logger.finest(() -> "Result of processing template: " + out);
return yamlMapper.readValue(out.toString(), JsonNode.class);
}
@ -746,6 +760,10 @@ public class Runner extends Component {
props = Runner.class.getResourceAsStream("logging.properties");
}
LogManager.getLogManager().readConfiguration(props);
Logger.getLogger(Runner.class.getName()).log(Level.CONFIG,
() -> path.isPresent()
? "Using logging configuration from " + path.get()
: "Using default logging configuration");
} catch (IOException e) {
e.printStackTrace();
}