xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

fixing config loading

Browse Source
This commit is contained in:
Braun Patrik 2017-01-24 20:37:16 +01:00
parent 935b723bdb
commit 374aa35dd2
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/config/ConfigLoader.ts
View File

@ -18,7 +18,7 @@ export class ConfigLoader {
} }
}); });
this.processHierarchyVar(configObject, varAliases); this.processHierarchyVar(configObject, varAliases);
this.loadObject(configObject, process.env); this.processHierarchyVar(configObject, process.env);
}; };
private static processArguments(configObject: any) { private static processArguments(configObject: any) {
@ -95,16 +95,22 @@ export class ConfigLoader {
} }
} }
private static loadObject(targetObject: any, sourceObject: any) {
private static loadObject(targetObject, sourceObject) {
Object.keys(sourceObject).forEach((key) => { Object.keys(sourceObject).forEach((key) => {
if (typeof targetObject[key] === "undefined") { if (typeof targetObject[key] === "undefined") {
return; return;
} }
if (typeof targetObject[key] === "object") {
this.loadObject(targetObject[key], sourceObject[key]); if (Array.isArray(targetObject[key])) {
} else { return targetObject[key] = sourceObject[key];
targetObject[key] = sourceObject[key];
} }
if (typeof targetObject[key] === "object") {
return this.loadObject(targetObject[key], sourceObject[key]);
}
targetObject[key] = sourceObject[key];
}); });
} }
} }