Fix Race Condition When Loading DB

jaruba · Jul 18, 2020 · 05e54de · 05e54de
1 parent e9c9b6e
commit 05e54de
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/server/utils/config.js b/server/utils/config.js
@@ -91,42 +91,25 @@ function loadUserConfig(err, obj) {
     }
 }
 
-const config = {
-    loaded: false,
-    getAll: () => {
-        if (!config.loaded) {
+function init() {
+    let obj, err
 
-            let obj, err
-
-            try {
-                obj = jsonfile.readFileSync(configPath)
-            } catch(e) {
-                err = e
-            }
+    try {
+        obj = jsonfile.readFileSync(configPath)
+    } catch(e) {
+        err = e
+    }
 
-            map = loadUserConfig(err, obj)
+    map = loadUserConfig(err, obj)
+}
 
-            config.loaded = true
+init()
 
-        }
+const config = {
+    getAll: () => {
         return map
     },
     get: str => {
-        if (!config.loaded) {
-
-            let obj, err
-
-            try {
-                obj = jsonfile.readFileSync(configPath)
-            } catch(e) {
-                err = e
-            }
-
-            map = loadUserConfig(err, obj)
-
-            config.loaded = true
-
-        }
         return map[str]
     },
     set: (str, value) => {