From ef28d2f1bfbe2785c36cd0961a577fb3c86656a5 Mon Sep 17 00:00:00 2001
From: Dan Janosik <dan@47.io>
Date: Mon, 11 Feb 2019 12:30:07 -0500
Subject: [PATCH] make sure .env files have been loaded before app.js pulls
 config.js in

---
 app.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 74d5dde..465cd06 100755
--- a/app.js
+++ b/app.js
@@ -2,8 +2,18 @@
 
 'use strict';
 
-var express = require('express');
+var os = require('os');
 var path = require('path');
+var dotenv = require("dotenv");
+var fs = require('fs');
+
+var configPaths = [ path.join(os.homedir(), '.config', 'btc-rpc-explorer.env'), path.join(process.cwd(), '.env') ];
+configPaths.filter(fs.existsSync).forEach(path => {
+	console.log('Loading env file:', path);
+	dotenv.config({ path });
+});
+
+var express = require('express');
 var favicon = require('serve-favicon');
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
@@ -22,9 +32,6 @@ var coreApi = require("./app/api/coreApi.js");
 var coins = require("./app/coins.js");
 var request = require("request");
 var qrcode = require("qrcode");
-var dotenv = require("dotenv");
-var os = require('os');
-var fs = require('fs');
 var electrumApi = require("./app/api/electrumApi.js");
 var Influx = require("influx");
 var coreApi = require("./app/api/coreApi.js");
@@ -32,12 +39,6 @@ var auth = require('./app/auth.js');
 
 var crawlerBotUserAgentStrings = [ "Googlebot", "Bingbot", "Slurp", "DuckDuckBot", "Baiduspider", "YandexBot", "Sogou", "Exabot", "facebot", "ia_archiver" ];
 
-var configPaths = [ path.join(os.homedir(), '.config', 'btc-rpc-explorer.env'), path.join(process.cwd(), '.env') ];
-configPaths.filter(fs.existsSync).forEach(path => {
-	console.log('Loading env file:', path);
-	dotenv.config({ path });
-});
-
 var baseActionsRouter = require('./routes/baseActionsRouter');
 
 var app = express();