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

Fix config loading

Browse Source
This commit is contained in:
Madeline 2022-12-19 20:39:43 +11:00
parent b84aa73852
commit f69aaa223e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,12 +14,16 @@ var pairs: ConfigEntity[];
export const Config = { export const Config = {
init: async function init() { init: async function init() {
if (config) return config; if (config) return 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);
// TODO: this overwrites existing config values with defaults. // TODO: this overwrites existing config values with defaults.
// we actually want to extend the object with new keys instead. // we actually want to extend the object with new keys instead.
// config = (config || {}).merge(new ConfigValue()); // config = (config || {}).merge(new ConfigValue());
// Object.assign(config, new ConfigValue());
// If a config doesn't exist, create it.
if (Object.keys(config).length == 0) config = 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.`);