Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't override existing config values

Browse Source
This commit is contained in:
Madeline 2022-12-19 18:35:36 +11:00
parent 803ab38fad
commit 295ef797fb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/util/Config.ts
View File

@ -17,7 +17,9 @@ export const Config = {
console.log('[Config] Loading configuration...') console.log('[Config] Loading configuration...')
pairs = await ConfigEntity.find(); pairs = await ConfigEntity.find();
config = pairsToConfig(pairs); config = pairsToConfig(pairs);
config = (config || {}).merge(new ConfigValue()); // TODO: this overwrites existing config values with defaults.
// we actually want to extend the object with new keys instead.
// config = (config || {}).merge(new ConfigValue());
if (process.env.CONFIG_PATH) { if (process.env.CONFIG_PATH) {
console.log(`[Config] Using config path from environment rather than database.`); console.log(`[Config] Using config path from environment rather than database.`);