Skip to content

Commit

Permalink
Close log files on unmount
Browse files Browse the repository at this point in the history
Signed-off-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com>
  • Loading branch information
samitiilikainen committed Dec 21, 2022
1 parent 45eb264 commit bdc0878
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/renderer/bootstrap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { Router } from "react-router";
import historyInjectable from "./navigation/history.injectable";
import assert from "assert";
import startFrameInjectable from "./start-frame/start-frame.injectable";
import closeRendererLogFileInjectable from "./logger/close-renderer-log-file.injectable";

export async function bootstrap(di: DiContainer) {
const startFrame = di.inject(startFrameInjectable);
Expand Down Expand Up @@ -61,7 +62,15 @@ export async function bootstrap(di: DiContainer) {
}

try {
await initializeApp(() => unmountComponentAtNode(rootElem));
const unmount = () => {
const closeLogFile = di.inject(closeRendererLogFileInjectable);

closeLogFile();

unmountComponentAtNode(rootElem);
};

await initializeApp(unmount);
} catch (error) {
console.error(`[BOOTSTRAP]: view initialization error: ${error}`, {
origin: location.href,
Expand Down
19 changes: 19 additions & 0 deletions src/renderer/logger/close-renderer-log-file.injectable.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import rendererFileLoggerTransportInjectable from "./file-transport.injectable";

const closeRendererLogFileInjectable = getInjectable({
id: "close-renderer-log-file",
instantiate: (di) => {
const fileLoggingTransport = di.inject(rendererFileLoggerTransportInjectable);

return () => {
fileLoggingTransport.close?.();
};
},
});

export default closeRendererLogFileInjectable;

0 comments on commit bdc0878

Please sign in to comment.