fix config loading

itteco · Nov 12, 2021 · d81041c · d81041c
1 parent 5c24bf3
commit d81041c
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 16 deletions.
diff --git a/app.js b/app.js
@@ -1,4 +1,6 @@
 import { cacheMiddleware, NotFound } from './utils.js';
+import CONFIG from './config.loader.js';
+global.CONFIG = CONFIG;
 
 console.log("");
 console.log("Starting Iframely...");

diff --git a/config.loader.js b/config.loader.js
@@ -0,0 +1,3 @@
+var globalConfig = await import(process.cwd() + '/config.js');
+globalConfig = globalConfig && globalConfig.default;
+export default globalConfig;
diff --git a/lib/cache-engines/memcached.js b/lib/cache-engines/memcached.js
@@ -1,7 +1,7 @@
 import log from '../../logging.js';
 import * as crypto from 'crypto';
 import Memcached from 'memcached';
-import CONFIG from '../../config.js';
+import CONFIG from '../../config.loader.js';
 
 var memcached = new Memcached(CONFIG.MEMCACHED_OPTIONS && CONFIG.MEMCACHED_OPTIONS.locations, CONFIG.MEMCACHED_OPTIONS && CONFIG.MEMCACHED_OPTIONS.options);
 

diff --git a/lib/cache-engines/node-cache.js b/lib/cache-engines/node-cache.js
@@ -1,5 +1,5 @@
     import NodeCache from "node-cache";
-    import CONFIG from '../../config.js';
+    import CONFIG from '../../config.loader.js';
 
     var nodeCache = new NodeCache({
         stdTTL: CONFIG.CACHE_TTL,

diff --git a/lib/cache-engines/redis.js b/lib/cache-engines/redis.js
@@ -1,5 +1,5 @@
     import log from '../../logging.js';
-    import CONFIG from '../../config.js';
+    import CONFIG from '../../config.loader.js';
 
     var client;
 

diff --git a/lib/cache.js b/lib/cache.js
@@ -1,5 +1,5 @@
     import * as _ from 'underscore';
-    import CONFIG from '../config.js';
+    import CONFIG from '../config.loader.js';
 
     var DEFAULT_CACHE = "node-cache";
 

diff --git a/lib/html-utils.js b/lib/html-utils.js
@@ -1,7 +1,7 @@
     import cheerio from 'cheerio';
 
     import * as _ from 'underscore';
-    import CONFIG from '../config.js';
+    import CONFIG from '../config.loader.js';
 
     var defaultPaddingBottom = 100 / CONFIG.DEFAULT_ASPECT_RATIO;
 

diff --git a/lib/loader/pluginLoader.js b/lib/loader/pluginLoader.js
@@ -6,6 +6,10 @@
     var JSLINT = node_jslint.load('latest');
     import * as utils from './utils.js';
 
+    import CONFIG from '../../config.loader.js';
+    // Global CONFIG used by plugins loaded during module import.
+    global.CONFIG = CONFIG;
+
     var PLUGIN_METHODS = utils.PLUGIN_METHODS,
         PLUGINS_FIELDS = utils.PLUGIN_FIELDS,
         PLUGIN_FIELDS_TYPE_DICT = utils.PLUGIN_FIELDS_TYPE_DICT,

diff --git a/lib/utils.js b/lib/utils.js
@@ -10,11 +10,7 @@ import { cache } from './cache.js';
 import * as htmlUtils from './html-utils.js';
 import log from '../logging.js';
 
-if (!global.CONFIG) {
-    // TODO: review
-     var config = await import('../config.js');
-     global.CONFIG = config.default;
-}
+import CONFIG from '../config.loader.js';
 
 function prepareEncodedUri(request_options, attr) {
     var url = request_options[attr];

diff --git a/lib/whitelist.js b/lib/whitelist.js
@@ -10,6 +10,8 @@
     import { fileURLToPath } from 'url';
     import { dirname } from 'path';
 
+    import CONFIG from '../config.loader.js';
+
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);
 

diff --git a/modules/tests-ui/models.js b/modules/tests-ui/models.js
@@ -1,7 +1,6 @@
     import moment from 'moment';
     import mongoose from 'mongoose';
-    import config from '../../config.js';
-    global.CONFIG = config;
+    import CONFIG from '../../config.loader.js';
 
     mongoose.set('useUnifiedTopology', true);
     mongoose.set('useCreateIndex', true);

diff --git a/modules/tests-ui/tester.js b/modules/tests-ui/tester.js
@@ -1,4 +1,4 @@
-import config from '../../config.js';
+import CONFIG from '../../config.loader.js';
 global.CONFIG = config;
 
 if (!CONFIG.tests) {

diff --git a/utils.js b/utils.js
@@ -1,6 +1,3 @@
-    import config from './config.js';
-    global.CONFIG = config;
-
     import * as async from 'async';
     import { cache } from './lib/cache.js';
     import * as ejs from 'ejs';