fix logging config reload

src/hypervisor/application_instance.ts

@@ -191,7 +191,10 @@ export class ApplicationInstance extends BaseInstance<AppConfiguration, Applicat
                         throw new RequireRestart()
                     }
 
-                    handle("logging", () => this._updateLogConfig())
+                    handle("logging", () => {
+                        this.options.logging = ncfg.logging;
+                        this._updateLogConfig();
+                    })
                 });
                 const disposer = this.hypervisor.watchConfigEntry<AppConfiguration>(`apps.${this.id}`, handler);
                 this.cleanups.append(disposer);
@@ -232,7 +235,7 @@ export class ApplicationInstance extends BaseInstance<AppConfiguration, Applicat
 
             this.resumableStore = new ResumableStore({
                 file: path.join(this.operating_directory, ".resumable_state.json"),
-                logger: this.logger,
+                logMessage: (...rest) => this.logMessage(...rest),
             }, {
                 "APPLICATION": this._instance,
             })

src/hypervisor/logging.ts

@@ -283,12 +283,14 @@ export function createDomainLogger(opts: LoggerOptions) {
 
 export type LogAMessage = typeof logMessage;
 
+/** Log a message to the app stream */
 export function logClientMessage(level: LogLevel, ...rest: any[]) {
     const ctx = current.application;
     const logger = ctx?.userSpaceLogger || UNKNOWN_LOGGER
     logger.logMessage(level, rest);
 }
 
+/** Log a message from an app-bound plugin to the app stream */
 export function logPluginClientMessage(plugin: any, level: LogLevel, ...rest: any[]) {
     if (!(plugin instanceof PluginInstance)) plugin = plugin[HyperWrapper];
 
@@ -297,14 +299,16 @@ export function logPluginClientMessage(plugin: any, level: LogLevel, ...rest: an
     logger.logMessage(level, ["[" + chalk.blueBright`${plugin.id}` + "]", ...rest], {});
 }
 
-export function logMessage(level: LogLevel, ...rest: any[]) {
-    const ctx = current.application || current.hypervisor;
+/** Log a message to the HV stream */
+export function logHVMessage(level: LogLevel, ...rest: any[]) {
+    const ctx = current.hypervisor;
     const logger = ctx?.logger || UNKNOWN_LOGGER
     logger.logMessage(level, rest);
 }
 
-export function logHVMessage(level: LogLevel, ...rest: any[]) {
-    const ctx = current.hypervisor;
+/** Log a message to the app stream if present, else to the HV stream */
+export function logMessage(level: LogLevel, ...rest: any[]) {
+    const ctx = current.application || current.hypervisor;
     const logger = ctx?.logger || UNKNOWN_LOGGER
     logger.logMessage(level, rest);
 }

src/hypervisor/plugin_instance.ts

@@ -27,8 +27,11 @@ export class PluginInstance extends BaseInstance<PluginConfiguration, Plugin> {
 
         // Self-watch for config changes
         if (this.options.watch?.config) {
-            const handler = configChangeHandler(this, async ({ handle }) => {
-                handle("logging", () => this._updateLogConfig())
+            const handler = configChangeHandler(this, async ({ handle, ncfg, ocfg }) => {
+                handle("logging", () => {
+                    this.options.logging = ncfg.logging;
+                    this._updateLogConfig();
+                });
             });
             const disposer = this.hypervisor.watchConfigEntry<PluginConfiguration>(`plugins.${this.id}`, handler);
             this.cleanups.append(disposer);

src/runtime/resumable/resumable_store.ts

@@ -13,7 +13,7 @@ interface TrackerEntry {
 
 interface StoreOptions {
     file: string,
-    logger: ExtendedLoger;
+    logMessage: ExtendedLoger['logMessage'];
 }
 
 export class ResumableStore {
@@ -99,7 +99,7 @@ export class ResumableStore {
     }
 
     protected logMessage(level: LogLevel, ...rest) {
-        this.opts.logger.logMessage(level, rest);
+        this.opts.logMessage(level, rest);
     }
 
     private async _loadWithLookups(serialized: any) {