xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Gracefully degrade bad config and also print some instructions #688

Browse Source
This commit is contained in:
Patrik J. Braun 2023-09-02 14:33:42 +02:00
parent 8a6b142229
commit f315e3d0a0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/config/private/Config.ts
View File

@ -6,9 +6,9 @@ import {ConfigClass, ConfigClassBuilder} from 'typeconfig/node';
import {IConfigClass} from 'typeconfig/common'; import {IConfigClass} from 'typeconfig/common';
import {PasswordHelper} from '../../../backend/model/PasswordHelper'; import {PasswordHelper} from '../../../backend/model/PasswordHelper';
import {TAGS} from '../public/ClientConfig'; import {TAGS} from '../public/ClientConfig';
import {NotificationManager} from '../../../backend/model/NotifocationManager';
declare const process: any; declare const process: any;
const upTime = new Date().toISOString(); const upTime = new Date().toISOString();
// TODO: Refactor Config to be injectable globally. // TODO: Refactor Config to be injectable globally.
// This is a bad habit to let the Config know if its in a testing env. // This is a bad habit to let the Config know if its in a testing env.
@ -87,7 +87,12 @@ export class PrivateConfigClass extends ServerConfig {
async original(): Promise<PrivateConfigClass & IConfigClass> { async original(): Promise<PrivateConfigClass & IConfigClass> {
const pc = ConfigClassBuilder.attachPrivateInterface(new PrivateConfigClass()); const pc = ConfigClassBuilder.attachPrivateInterface(new PrivateConfigClass());
await pc.load(); try {
await pc.load();
}catch (e){
console.error('Error during loading original config. Reverting to defaults.');
console.error(e);
}
return pc; return pc;
} }
@ -96,5 +101,11 @@ export class PrivateConfigClass extends ServerConfig {
export const Config = ConfigClassBuilder.attachInterface( export const Config = ConfigClassBuilder.attachInterface(
new PrivateConfigClass() new PrivateConfigClass()
); );
Config.loadSync(); try {
Config.loadSync();
} catch (e) {
console.error('Error during loading config. Reverting to defaults.');
console.error('This is most likely due to: 1) you added a bad configuration in the server.json OR 2) The configuration changed in the latest release.');
console.error(e);
NotificationManager.error('Cant load config. Reverting to default. This is most likely due to: 1) you added a bad configuration in the server.json OR 2) The configuration changed in the latest release.', (e.toString ? e.toString() : JSON.stringify(e)));
}