Elgato_dark/podman-desktop
1
0
Fork 0
mirror of https://github.com/podman-desktop/podman-desktop synced 2026-04-21 09:37:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

chore: update electron app name to be from product.json and use correct logs files paths (#17107)

Browse source 
* chore: update electron app name to be from product.json and use correct logs files paths
Signed-off-by: Sonia Sandler <ssandler@redhat.com>

* chore: update copyrights years
Signed-off-by: Sonia Sandler <ssandler@redhat.com>
This commit is contained in:
Sonia Sandler 2026-04-16 20:03:27 -04:00 committed by GitHub
parent 5590f265a2
commit e860fcfbaa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/main/src/main.ts
View file

@ -1,5 +1,5 @@
/**********************************************************************
* Copyright (C) 2022-2025 Red Hat, Inc.
* Copyright (C) 2022-2026 Red Hat, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -55,6 +55,7 @@ export class Main implements IDisposable {
constructor(app: ElectronApp) {
this.app = app;
this.app.name = product.name;
this.mainWindowDeferred = Promise.withResolvers<BrowserWindow>();
this.protocolLauncher = new ProtocolLauncher(this.mainWindowDeferred);
this.#plugins = [new DefaultProtocolClient(this.app), new WindowPlugin(this.app, this.mainWindowDeferred.resolve)];

22
packages/main/src/plugin/troubleshooting.spec.ts
View file

@ -1,5 +1,5 @@
/**********************************************************************
* Copyright (C) 2024 Red Hat, Inc.
* Copyright (C) 2024-2026 Red Hat, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -23,6 +23,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
import type { DialogRegistry } from '/@/plugin/dialog-registry.js';
import { Uri } from '/@/plugin/types/uri.js';
import product from '/@product.json' with { type: 'json' };
import type { TroubleshootingFileMap } from './troubleshooting.js';
import { Troubleshooting } from './troubleshooting.js';
@ -52,8 +53,12 @@ vi.mock('adm-zip', () => {
};
});
vi.mock(import('/@product.json'));
beforeEach(() => {
vi.resetAllMocks();
vi.mocked(product).name = 'Test Id';
vi.mocked(product).artifactName = 'test-id';
});
describe('saveLogs', () => {
@ -190,14 +195,8 @@ test('Should return getMacSystemLogs if the platform is darwin', async () => {
expect(readFileMock).toHaveBeenCalledTimes(2);
// Expect readFileMock to have been called with /Library/Logs/Podman Desktop/launchd-stdout.log but CONTAINED in the path
expect(readFileMock).toHaveBeenCalledWith(
expect.stringContaining('/Library/Logs/Podman Desktop/launchd-stdout'),
'utf-8',
);
expect(readFileMock).toHaveBeenCalledWith(
expect.stringContaining('/Library/Logs/Podman Desktop/launchd-stderr'),
'utf-8',
);
expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining('/Library/Logs/Test Id/launchd-stdout'), 'utf-8');
expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining('/Library/Logs/Test Id/launchd-stderr'), 'utf-8');
});
// Should return getWindowsSystemLogs if the platform is win32
@ -225,10 +224,7 @@ test('Should return getWindowsSystemLogs if the platform is win32', async () =>
expect(readFileMock).toHaveBeenCalledTimes(1);
// Expect readFileMock to have been called with ~/AppData/Roaming/Podman Desktop/logs/podman-desktop.log but CONTAINED in the path
expect(readFileMock).toHaveBeenCalledWith(
expect.stringContaining('/AppData/Roaming/Podman Desktop/logs/podman-desktop'),
'utf-8',
);
expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining('/AppData/Roaming/Test Id/logs/test-id'), 'utf-8');
});
// test generateLogFileName for different cases

9
packages/main/src/plugin/troubleshooting.ts
View file

@ -1,5 +1,5 @@
/**********************************************************************
* Copyright (C) 2024-2025 Red Hat, Inc.
* Copyright (C) 2024-2026 Red Hat, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -26,6 +26,7 @@ import moment from 'moment';
import { DialogRegistry } from '/@/plugin/dialog-registry.js';
import { Uri } from '/@/plugin/types/uri.js';
import product from '/@product.json' with { type: 'json' };
const SYSTEM_FILENAME = 'system';
@ -45,7 +46,7 @@ export class Troubleshooting {
// all the logs and save them to a zip file.
// this also takes in the console logs and adds them to the zip file (see preload/src/index.ts) regarding memoryLogs
async saveLogs(console: { logType: LogType; message: string }[]): Promise<string[]> {
const defaultUri = this.generateLogFileName('podman-desktop', 'zip');
const defaultUri = this.generateLogFileName(product.artifactName, 'zip');
const uri = await this.dialogRegistry.saveDialog({ title: 'Save Logs as .zip', defaultUri: Uri.file(defaultUri) });
if (!uri) {
@ -81,10 +82,10 @@ export class Troubleshooting {
case 'darwin':
return this.getLogsFromFiles(
['launchd-stdout.log', 'launchd-stderr.log'],
`${os.homedir()}/Library/Logs/Podman Desktop`,
`${os.homedir()}/Library/Logs/${product.name}`,
);
case 'win32':
return this.getLogsFromFiles(['podman-desktop'], `${os.homedir()}/AppData/Roaming/Podman Desktop/logs`);
return this.getLogsFromFiles([product.artifactName], `${os.homedir()}/AppData/Roaming/${product.name}/logs`);
default:
// Unsupported platform, so do not return anything
return [];