Fixing bug where code failed when enviroment variable isn't set

pantsel · Feb 5, 2018 · 1289db2 · 1289db2
1 parent 3adb3fc
commit 1289db2
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/config/default-user-seed-data.js b/config/default-user-seed-data.js
@@ -9,27 +9,32 @@ var fs = require('fs');
  on enviroment variable setting
 */
 function getseedData() {
-  var readEnvVar = process.env.KONGA_SEED_USER_DATA_SOURCE_FILE.trim();
-  if (readEnvVar.length == 0) {
-    readEnvVar = undefined
+  var readEnvVar = process.env.KONGA_SEED_USER_DATA_SOURCE_FILE;
+  if (typeof(readEnvVar) == undefined) {
+    readEnvVar = undefined;
   } else {
-    if (!fs.existsSync(readEnvVar)) {
-      console.log('Could not find KONGA_SEED_USER_DATA_SOURCE_FILE')
-      readEnvVar = undefined
-    }
-    try {
-      var seedUserData = require(readEnvVar);
-      if (typeof(seedUserData) != 'object') {
-        readEnvVar = undefined
-      } else {
-        // We may place other checks on file contents here if required
-        console.log('Sucessfully read in user seed data file');
-      }
-    } catch (e) {
-      console.log(e);
-      console.log('Failed to load KONGA_SEED_USER_DATA_SOURCE_FILE');
-      console.log('Reverting to default user seed');
+    readEnvVar = readEnvVar.trim();
+    if (readEnvVar.length == 0) {
       readEnvVar = undefined;
+    } else {
+      if (!fs.existsSync(readEnvVar)) {
+        console.log('Could not find KONGA_SEED_USER_DATA_SOURCE_FILE');
+        readEnvVar = undefined;
+      }
+      try {
+        var seedUserData = require(readEnvVar);
+        if (typeof(seedUserData) != 'object') {
+          readEnvVar = undefined;
+        } else {
+          // We may place other checks on file contents here if required
+          console.log('Sucessfully read in user seed data file');
+        }
+      } catch (e) {
+        console.log(e);
+        console.log('Failed to load KONGA_SEED_USER_DATA_SOURCE_FILE');
+        console.log('Reverting to default user seed');
+        readEnvVar = undefined;
+      }
     }
   }
   if(typeof(readEnvVar) == 'undefined') {