Merge branch 'master' into dev/proto_capability_rework
This commit is contained in:
@@ -36,7 +36,7 @@ try {
|
||||
var configRaw = fs.readFileSync('config.toml').toString();
|
||||
Config = toml.parse(configRaw);
|
||||
} catch (e) {
|
||||
logger.error('Fatal error: Failed to read or parse the config file: {0}', (e as Error).message);
|
||||
logger.error({err: e}, 'Fatal error: Failed to read or parse the config file');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ async function start() {
|
||||
vncPort: Config.qemu.vncPort,
|
||||
};
|
||||
|
||||
VM = new QemuVMShim(def);
|
||||
VM = new QemuVMShim(def, Config.qemu.resourceLimits);
|
||||
break;
|
||||
}
|
||||
case 'vncvm': {
|
||||
|
||||
Reference in New Issue
Block a user