Remove all usages of legacy global logger

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/renderer/port-forward/port-forward-dialog.tsx

@@ -18,18 +18,20 @@ import { Checkbox } from "../components/checkbox";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { PortForwardDialogData, PortForwardDialogModel } from "./port-forward-dialog-model/port-forward-dialog-model";
 import portForwardDialogModelInjectable from "./port-forward-dialog-model/port-forward-dialog-model.injectable";
-import logger from "../../common/logger";
+import type { Logger } from "../../common/logger";
 import portForwardStoreInjectable from "./port-forward-store/port-forward-store.injectable";
 import aboutPortForwardingInjectable from "./about-port-forwarding.injectable";
 import notifyErrorPortForwardingInjectable from "./notify-error-port-forwarding.injectable";
 import type { OpenPortForward } from "./open-port-forward.injectable";
 import openPortForwardInjectable from "./open-port-forward.injectable";
+import loggerInjectable from "../../common/logger.injectable";
 
 export interface PortForwardDialogProps extends Partial<DialogProps> {}
 
 interface Dependencies {
   portForwardStore: PortForwardStore;
   model: PortForwardDialogModel;
+  logger: Logger;
   aboutPortForwarding: () => void;
   notifyErrorPortForwarding: (message: string) => void;
   openPortForward: OpenPortForward;
@@ -94,7 +96,7 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
         this.props.openPortForward(portForward);
       }
     } catch (error) {
-      logger.error(`[PORT-FORWARD-DIALOG]: ${error}`, portForward);
+      this.props.logger.error(`[PORT-FORWARD-DIALOG]: ${error}`, portForward);
     } finally {
       this.props.model.close();
     }
@@ -170,17 +172,14 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
   }
 }
 
-export const PortForwardDialog = withInjectables<Dependencies, PortForwardDialogProps>(
-  NonInjectedPortForwardDialog,
-
-  {
-    getProps: (di, props) => ({
-      portForwardStore: di.inject(portForwardStoreInjectable),
-      model: di.inject(portForwardDialogModelInjectable),
-      aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
-      notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
-      openPortForward: di.inject(openPortForwardInjectable),
-      ...props,
-    }),
-  },
-);
+export const PortForwardDialog = withInjectables<Dependencies, PortForwardDialogProps>(NonInjectedPortForwardDialog, {
+  getProps: (di, props) => ({
+    ...props,
+    portForwardStore: di.inject(portForwardStoreInjectable),
+    model: di.inject(portForwardDialogModelInjectable),
+    aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
+    notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
+    openPortForward: di.inject(openPortForwardInjectable),
+    logger: di.inject(loggerInjectable),
+  }),
+});

src/renderer/port-forward/port-forward-store/port-forward-store.injectable.ts

@@ -9,6 +9,7 @@ import createStorageInjectable from "../../utils/create-storage/create-storage.i
 import notifyErrorPortForwardingInjectable from "../notify-error-port-forwarding.injectable";
 import requestActivePortForwardInjectable from "./request-active-port-forward.injectable";
 import apiBaseInjectable from "../../../common/k8s-api/api-base.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 
 const portForwardStoreInjectable = getInjectable({
   id: "port-forward-store",
@@ -24,6 +25,7 @@ const portForwardStoreInjectable = getInjectable({
       notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
       apiBase: di.inject(apiBaseInjectable),
       requestActivePortForward: di.inject(requestActivePortForwardInjectable),
+      logger: di.inject(loggerInjectable),
     });
   },
 });

src/renderer/port-forward/port-forward-store/port-forward-store.ts

@@ -10,14 +10,15 @@ import { autoBind, disposer } from "../../utils";
 import type { ForwardedPort } from "../port-forward-item";
 import { PortForwardItem } from "../port-forward-item";
 import { waitUntilFree } from "tcp-port-used";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import type { JsonApi } from "../../../common/k8s-api/json-api";
 import type { RequestActivePortForward } from "./request-active-port-forward.injectable";
 
 interface Dependencies {
   readonly storage: StorageLayer<ForwardedPort[] | undefined>;
-  notifyErrorPortForwarding: (message: string) => void;
   readonly apiBase: JsonApi; // TODO: replace with individual dependencies
+  readonly logger: Logger;
+  notifyErrorPortForwarding: (message: string) => void;
   requestActivePortForward: RequestActivePortForward;
 }
 
@@ -38,7 +39,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
     const savedPortForwards = this.dependencies.storage.get(); // undefined on first load
 
     if (Array.isArray(savedPortForwards) && savedPortForwards.length > 0) {
-      logger.info("[PORT-FORWARD-STORE] starting saved port-forwards");
+      this.dependencies.logger.info("[PORT-FORWARD-STORE] starting saved port-forwards");
 
       // add the disabled ones
       await Promise.all(savedPortForwards.filter(pf => pf.status === "Disabled").map(this.add));
@@ -169,7 +170,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
     if (!pf) {
       const error = new Error("port-forward not found");
 
-      logger.warn(
+      this.dependencies.logger.warn(
         `[PORT-FORWARD-STORE] Error getting port-forward: ${error}`,
         portForward,
       );
@@ -181,7 +182,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
       await this.stop(portForward);
     } catch (error) {
       if (pf.status === "Active") {
-        logger.warn(
+        this.dependencies.logger.warn(
           `[PORT-FORWARD-STORE] Error removing port-forward: ${error}`,
           portForward,
         );
@@ -214,7 +215,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
     const pf = this.findPortForward(portForward);
 
     if (!pf) {
-      logger.warn(
+      this.dependencies.logger.warn(
         "[PORT-FORWARD-STORE] Error getting port-forward: port-forward not found",
         portForward,
       );
@@ -231,7 +232,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
       );
       await waitUntilFree(+forwardPort, 200, 1000);
     } catch (error) {
-      logger.warn(
+      this.dependencies.logger.warn(
         `[PORT-FORWARD-STORE] Error stopping active port-forward: ${error}`,
         portForward,
       );
@@ -289,7 +290,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
         response?.port &&
         response.port != +pf.forwardPort
       ) {
-        logger.warn(
+        this.dependencies.logger.warn(
           `[PORT-FORWARD-STORE] specified ${pf.forwardPort}, got ${response.port}`,
         );
       }
@@ -297,7 +298,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
       pf.forwardPort = response.port;
       pf.status = "Active";
     } catch (error) {
-      logger.warn(
+      this.dependencies.logger.warn(
         `[PORT-FORWARD-STORE] Error starting port-forward: ${error}`,
         pf,
       );
@@ -328,7 +329,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
       const pf = await this.dependencies.requestActivePortForward(portForward);
 
       if (pf?.forwardPort && pf.forwardPort !== portForward.forwardPort) {
-        logger.warn(
+        this.dependencies.logger.warn(
           `[PORT-FORWARD-STORE] local port, expected ${pf.forwardPort}, got ${portForward.forwardPort}`,
         );
       }