Remove silly support for async initial_value

This complicates the handling of configs for no good reason.
This commit is contained in:
Hornwitser committed 2024-01-06 19:49:35 +01:00
1 parent ede150d80f
commit 27af142a87
15 files changed
+93 -93

No files matched your search

+3 -3
View File
@@ -156,7 +156,7 @@ async function handleBootstrapCommand(
return;
}
let controlConfig = new lib.ControlConfig("control");
await controlConfig.init();
controlConfig.init();
controlConfig.set("control.controller_url", Controller.calculateControllerUrl(controllerConfig));
controlConfig.set(
@@ -325,12 +325,12 @@ async function initialize(): Promise<InitializeParameters> {
const controllerConfig = new lib.ControllerConfig("controller");
try {
let fileData = await fs.readFile(controllerConfigPath, { encoding: "utf8" });
await controllerConfig.load(JSON.parse(fileData));
controllerConfig.load(JSON.parse(fileData));
} catch (err: any) {
if (err.code === "ENOENT") {
logger.info("Config not found, initializing new config");
await controllerConfig.init();
controllerConfig.init();
} else {
throw new lib.StartupError(`Failed to load ${controllerConfigPath}: ${err.message}`);
+2 -2
View File
@@ -212,7 +212,7 @@ export default class ControlConnection extends BaseConnection {
async handleHostConfigCreateRequest(request: lib.HostConfigCreateRequest) {
let hostConfig = new lib.HostConfig("control");
await hostConfig.init();
hostConfig.init();
hostConfig.set("host.controller_url", this._controller.getControllerUrl());
if (request.id !== undefined) {
@@ -239,7 +239,7 @@ export default class ControlConnection extends BaseConnection {
// XXX should probably add a hook for host reuqests?
async handleInstanceCreateRequest(request: lib.InstanceCreateRequest) {
let instanceConfig = new lib.InstanceConfig("controller");
await instanceConfig.load(request.config as lib.SerializedConfig);
instanceConfig.load(request.config as lib.SerializedConfig);
await this._controller.instanceCreate(instanceConfig);
}
+3 -3
View File
@@ -498,7 +498,7 @@ export default class Controller {
json = { config: json, status: "running" }; // Use running to force updatedAt
}
let instanceConfig = new lib.InstanceConfig("controller");
await instanceConfig.load(json.config as lib.SerializedConfig);
instanceConfig.load(json.config as lib.SerializedConfig);
let instance = InstanceInfo.fromJSON(json, instanceConfig);
const status = instance.config.get("instance.assigned_host") === null ? "unassigned" : "unknown";
if (instance.status !== status) {
@@ -690,7 +690,7 @@ export default class Controller {
*
* @example
* let instanceConfig = new lib.InstanceConfig("controller");
* await instanceConfig.init();
* instanceConfig.init();
* instanceConfig.set("instance.name", "My instance");
* let instance = await controller.instanceAssign(instanceConfig);
* await controller.instanceAssign(instance.id, hostId);
@@ -1007,7 +1007,7 @@ export default class Controller {
}
let controllerPlugin = new ControllerPluginClass(pluginInfo, this, metrics as any, logger);
await controllerPlugin.init();
controllerPlugin.init();
this.plugins.set(pluginInfo.name, controllerPlugin);
} catch (err: any) {
+1 -1
View File
@@ -198,7 +198,7 @@ export default class HostConnection extends BaseConnection {
const instanceUpdates: InstanceInfo[] = [];
for (let instanceData of request.instances) {
let instanceConfig = new lib.InstanceConfig("controller");
await instanceConfig.load(instanceData.config as lib.SerializedConfig, "host");
instanceConfig.load(instanceData.config as lib.SerializedConfig, "host");
let controllerInstance = this._controller.instances.get(instanceConfig.get("instance.id"));
if (controllerInstance) {