From 9a18e66107968318b52ce62f9fe26810186feb98 Mon Sep 17 00:00:00 2001
From: Pete Fritchman <petef@databits.net>
Date: Mon, 28 Nov 2011 15:18:33 -0800
Subject: [PATCH] read NODE_EXTRA_CONFIG after we setup g_configs.test_*
---
lib/configuration.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/configuration.js b/lib/configuration.js
index b65238011..41293f4cd 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -106,11 +106,6 @@ g_configs.local = {
min_time_between_emails_ms: g_configs.production.min_time_between_emails_ms
};
-if (undefined !== process.env['NODE_EXTRA_CONFIG']) {
- var fs = require('fs');
- eval(fs.readFileSync(process.env['NODE_EXTRA_CONFIG']) + '');
-}
-
// test environments are variations on local
g_configs.test_json = JSON.parse(JSON.stringify(g_configs.local));
g_configs.test_json.database = {
@@ -124,6 +119,11 @@ g_configs.test_mysql.database = {
create_schema: true
};
+if (undefined !== process.env['NODE_EXTRA_CONFIG']) {
+ var fs = require('fs');
+ eval(fs.readFileSync(process.env['NODE_EXTRA_CONFIG']) + '');
+}
+
// default deployment is local
if (undefined === process.env['NODE_ENV']) {
process.env['NODE_ENV'] = 'local';
--
GitLab