c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-01 08:31:59 +00:00
Code Releases Activity

fix: config error logging (#9738)

Browse source
This commit is contained in:
Jason Rasmussen 2024-05-24 16:44:50 -04:00 committed by GitHub
parent f197f5d530
commit 95012dc19b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/src/cores/system-config.core.ts
View file

@ -137,6 +137,7 @@ export class SystemConfigCore {
return loadYaml(file.toString()) as unknown; return loadYaml(file.toString()) as unknown;
} catch (error: Error | any) { } catch (error: Error | any) {
this.logger.error(`Unable to load configuration file: ${filepath}`); this.logger.error(`Unable to load configuration file: ${filepath}`);
this.logger.error(error);
throw error; throw error;
} }
} }

15
server/src/services/system-config.service.spec.ts
View file

@ -231,6 +231,21 @@ describe(SystemConfigService.name, () => {
expect(systemMock.readFile).toHaveBeenCalledWith('immich-config.json'); expect(systemMock.readFile).toHaveBeenCalledWith('immich-config.json');
}); });
it('should log errors with the config file', async () => {
process.env.IMMICH_CONFIG_FILE = 'immich-config.json';
systemMock.readFile.mockResolvedValue(`{ "ffmpeg2": true, "ffmpeg2": true }`);
await expect(sut.getConfig()).rejects.toBeInstanceOf(Error);
expect(systemMock.readFile).toHaveBeenCalledWith('immich-config.json');
expect(loggerMock.error).toHaveBeenCalledTimes(2);
expect(loggerMock.error.mock.calls[0][0]).toEqual('Unable to load configuration file: immich-config.json');
expect(loggerMock.error.mock.calls[1][0].toString()).toEqual(
expect.stringContaining('YAMLException: duplicated mapping key (1:20)'),
);
});
it('should load the config from a yaml file', async () => { it('should load the config from a yaml file', async () => {
process.env.IMMICH_CONFIG_FILE = 'immich-config.yaml'; process.env.IMMICH_CONFIG_FILE = 'immich-config.yaml';
const partialConfig = ` const partialConfig = `