Use LoggyIntf.expectInstanceOrNull().

danfuzz · Dec 9, 2024 · 86be1be · 86be1be
1 parent e62c578
commit 86be1be
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/metacomp/export/LimitedLoader.js b/src/metacomp/export/LimitedLoader.js
@@ -71,7 +71,7 @@ export class LimitedLoader {
    */
   constructor(context = null, logger = null) {
     this.#context = context;
-    this.#logger  = logger;
+    this.#logger  = IntfLogger.expectInstanceOrNull(logger);
 
     if (context && !vm.isContext(context)) {
       vm.createContext(context);

diff --git a/src/net-protocol/export/ProtocolWrangler.js b/src/net-protocol/export/ProtocolWrangler.js
@@ -181,7 +181,7 @@ export class ProtocolWrangler {
    *   logging.
    */
   async init(logger) {
-    this.#logger = logger;
+    this.#logger = IntfLogger.expectInstanceOrNull(logger);
 
     // Confusion alert!: This is not the same as the `requestLogger` (a "request
     // logger") per se) passed in as an option. This is the sub-logger of the

diff --git a/src/net-protocol/private/AsyncServerSocket.js b/src/net-protocol/private/AsyncServerSocket.js
@@ -76,7 +76,7 @@ export class AsyncServerSocket {
     // Note: `interface` is a reserved word.
     this.#interface = MustBe.instanceOf(iface, InterfaceAddress);
     this.#protocol  = MustBe.string(protocol);
-    this.#logger    = logger;
+    this.#logger    = IntfLogger.expectInstanceOrNull(logger);
   }
 
   /**

diff --git a/src/net-protocol/private/WranglerContext.js b/src/net-protocol/private/WranglerContext.js
@@ -267,8 +267,8 @@ export class WranglerContext {
     ctx.#socket   = socket;
 
     if (logger) {
-      ctx.#connectionLogger = logger;
-      ctx.#connectionId     = logger.$meta.lastContext;
+      ctx.#connectionLogger = IntfLogger.expectInstanceOrNull(logger);
+      ctx.#connectionId     = logger?.$meta.lastContext ?? null;
     }
 
     ctx.bind(socket);

diff --git a/src/net-util/export/DispatchInfo.js b/src/net-util/export/DispatchInfo.js
@@ -57,7 +57,7 @@ export class DispatchInfo extends IntfDeconstructable {
 
     this.#base   = MustBe.instanceOf(base, PathKey);
     this.#extra  = MustBe.instanceOf(extra, PathKey);
-    this.#logger = (logger === null) ? null : MustBe.callableFunction(logger);
+    this.#logger = IntfLogger.expectInstanceOrNull(logger);
   }
 
   /** @override */

diff --git a/src/webapp-core/export/HostManager.js b/src/webapp-core/export/HostManager.js
@@ -130,7 +130,7 @@ export class HostManager extends TemplAggregateComponent('HostAggregate', BaseCo
      * @param {?IntfLogger} logger Logger to use, if any.
      */
     constructor(logger) {
-      this.#logger = logger;
+      this.#logger = IntfLogger.expectInstanceOrNull(logger);
     }
 
     /**