hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Update messaging to work with new base

Browse Source 
Signed-off-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com>
This commit is contained in:
Sami Tiilikainen 2023-03-22 15:34:22 +02:00
parent 10d3539235
commit dcdba45f28
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/common/logger/ipc-file-logger-channel.ts
View File

@ -2,7 +2,8 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
import type { MessageChannel } from "@k8slens/messaging";
export interface IpcFileLogObject { export interface IpcFileLogObject {
fileId: string; fileId: string;

4
packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts
View File

@ -2,8 +2,8 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getMessageChannelListenerInjectable } from "@k8slens/messaging";
import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable";
import { getMessageChannelListenerInjectable } from "../../common/utils/channel/message-channel-listener-injection-token";
import { import {
closeIpcFileLoggerChannel, closeIpcFileLoggerChannel,
} from "../../common/logger/ipc-file-logger-channel"; } from "../../common/logger/ipc-file-logger-channel";
@ -11,7 +11,7 @@ import {
const closeIpcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({ const closeIpcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({
id: "close-ipc-file-logging", id: "close-ipc-file-logging",
channel: closeIpcFileLoggerChannel, channel: closeIpcFileLoggerChannel,
handler: (di) => { getHandler: (di) => {
const ipcFileLogger = di.inject(ipcFileLoggerInjectable); const ipcFileLogger = di.inject(ipcFileLoggerInjectable);
return (fileId) => ipcFileLogger.close(fileId); return (fileId) => ipcFileLogger.close(fileId);

4
packages/core/src/main/logger/ipc-logging-listener.injectable.ts
View File

@ -2,7 +2,7 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getMessageChannelListenerInjectable } from "../../common/utils/channel/message-channel-listener-injection-token"; import { getMessageChannelListenerInjectable } from "@k8slens/messaging";
import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel"; import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel";
import { ipcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel"; import { ipcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel";
import { MESSAGE } from "triple-beam"; import { MESSAGE } from "triple-beam";
@ -28,7 +28,7 @@ export function deserializeLogFromIpc(ipcFileLogObject: IpcFileLogObject) {
const ipcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({ const ipcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({
id: "ipc-file-logging", id: "ipc-file-logging",
channel: ipcFileLoggerChannel, channel: ipcFileLoggerChannel,
handler: (di) => { getHandler: (di) => {
const ipcFileLogger = di.inject(ipcFileLoggerInjectable); const ipcFileLogger = di.inject(ipcFileLoggerInjectable);
return (ipcFileLogObject) => return (ipcFileLogObject) =>

8
packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts
View File

@ -2,13 +2,13 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import type winston from "winston";
import type { SendMessageToChannel } from "@k8slens/messaging";
import { sendMessageToChannelInjectionToken } from "@k8slens/messaging";
import type { DiContainer } from "@ogre-tools/injectable";
import winstonLoggerInjectable from "../../common/winston-logger.injectable"; import winstonLoggerInjectable from "../../common/winston-logger.injectable";
import { getDiForUnitTesting } from "../getDiForUnitTesting"; import { getDiForUnitTesting } from "../getDiForUnitTesting";
import closeRendererLogFileInjectable from "./close-renderer-log-file.injectable"; import closeRendererLogFileInjectable from "./close-renderer-log-file.injectable";
import type { DiContainer } from "@ogre-tools/injectable";
import type winston from "winston";
import type { SendMessageToChannel } from "../../common/utils/channel/message-to-channel-injection-token";
import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token";
import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable";
import ipcLogTransportInjectable from "./ipc-transport.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable";
import type IpcLogTransport from "./ipc-transport"; import type IpcLogTransport from "./ipc-transport";

2
packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts
View File

@ -2,10 +2,10 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { sendMessageToChannelInjectionToken } from "@k8slens/messaging";
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import winstonLoggerInjectable from "../../common/winston-logger.injectable"; import winstonLoggerInjectable from "../../common/winston-logger.injectable";
import { closeIpcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel"; import { closeIpcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel";
import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token";
import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable";
import ipcLogTransportInjectable from "./ipc-transport.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable";

5
packages/core/src/renderer/logger/ipc-transport.injectable.ts
View File

@ -8,14 +8,13 @@ import type winston from "winston";
import { MESSAGE } from "triple-beam"; import { MESSAGE } from "triple-beam";
import IpcLogTransport from "./ipc-transport"; import IpcLogTransport from "./ipc-transport";
import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token"; import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel";
import type {
IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel";
import { import {
closeIpcFileLoggerChannel, closeIpcFileLoggerChannel,
ipcFileLoggerChannel, ipcFileLoggerChannel,
} from "../../common/logger/ipc-file-logger-channel"; } from "../../common/logger/ipc-file-logger-channel";
import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable";
import { sendMessageToChannelInjectionToken } from "@k8slens/messaging";
/** /**
* Winston uses symbol property for the actual message. * Winston uses symbol property for the actual message.

6
packages/core/src/renderer/logger/ipc-transport.test.ts
View File

@ -3,12 +3,12 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import type { DiContainer } from "@ogre-tools/injectable"; import type { DiContainer } from "@ogre-tools/injectable";
import type { SendMessageToChannel } from "../../common/utils/channel/message-to-channel-injection-token"; import { MESSAGE } from "triple-beam";
import { sendMessageToChannelInjectionToken } from "../../common/utils/channel/message-to-channel-injection-token"; import type { SendMessageToChannel } from "@k8slens/messaging";
import { sendMessageToChannelInjectionToken } from "@k8slens/messaging";
import { getDiForUnitTesting } from "../getDiForUnitTesting"; import { getDiForUnitTesting } from "../getDiForUnitTesting";
import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable";
import ipcLogTransportInjectable from "./ipc-transport.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable";
import { MESSAGE } from "triple-beam";
describe("renderer log transport through ipc", () => { describe("renderer log transport through ipc", () => {
let di: DiContainer; let di: DiContainer;