Skip to content

Node.js based forum software built for the modern web

refactor: get rid of global.env, use process.env.NODE_ENV

Barış Soner Uşaklı07d1f22401cf
diff --git a/app.js b/app.js
index b6067d726b..c493817491 100644
--- a/app.js
+++ b/app.js
@@ -33,7 +33,6 @@ const path = require('path');
const file = require('./src/file');
process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-global.env = process.env.NODE_ENV || 'production';
// Alternate configuration file support
const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
diff --git a/src/cli/index.js b/src/cli/index.js
index e868b702c4..eeda530f5b 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -97,7 +97,6 @@ nconf.argv(opts).env({
});
process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-global.env = process.env.NODE_ENV || 'production';
prestart.setupWinston();
@@ -139,7 +138,6 @@ program
.description('Start NodeBB in verbose development mode')
.action(() => {
process.env.NODE_ENV = 'development';
- global.env = 'development';
require('./running').start({ ...program.opts(), dev: true });
});
program
@@ -206,7 +204,6 @@ program
.action((targets, options) => {
if (program.opts().dev) {
process.env.NODE_ENV = 'development';
- global.env = 'development';
}
require('./manage').build(targets.length ? targets : true, options);
})
@@ -296,7 +293,6 @@ program
options.unattended = program.opts().unattended;
if (program.opts().dev) {
process.env.NODE_ENV = 'development';
- global.env = 'development';
}
require('./upgrade').upgrade(scripts.length ? scripts : true, options);
});
diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js
index 20f31c2b67..91d6e401c1 100644
--- a/src/controllers/admin/dashboard.js
+++ b/src/controllers/admin/dashboard.js
@@ -69,7 +69,7 @@ async function getNotices() {
});
}
- if (global.env !== 'production') {
+ if (process.env.NODE_ENV !== 'production') {
notices.push({
done: false,
notDoneText: '[[admin/dashboard:running-in-development]]',
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index f3ba8a4f0d..27366459a9 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -510,7 +510,7 @@ helpers.formatApiResponse = async (statusCode, res, payload) => {
const returnPayload = await helpers.generateError(statusCode, message, res);
returnPayload.response = response;
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
returnPayload.stack = payload.stack;
process.stdout.write(`[${chalk.yellow('api')}] Exception caught, error with stack trace follows:\n`);
process.stdout.write(payload.stack);
diff --git a/src/meta/dependencies.js b/src/meta/dependencies.js
index 5bb2a73c2a..dc697de20c 100644
--- a/src/meta/dependencies.js
+++ b/src/meta/dependencies.js
@@ -24,7 +24,7 @@ Dependencies.check = async function () {
if (depsMissing) {
throw new Error('dependencies-missing');
- } else if (depsOutdated && global.env !== 'development') {
+ } else if (depsOutdated && process.env.NODE_ENV !== 'development') {
throw new Error('dependencies-out-of-date');
}
};
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 02024b8a19..0e0fbcde3e 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -221,7 +221,7 @@ middleware.privateUploads = function privateUploads(req, res, next) {
};
middleware.busyCheck = function busyCheck(req, res, next) {
- if (global.env === 'production' && meta.config.eventLoopCheckEnabled && toobusy()) {
+ if (process.env.NODE_ENV === 'production' && meta.config.eventLoopCheckEnabled && toobusy()) {
analytics.increment('errors:503');
res.status(503).type('text/html').sendFile(path.join(__dirname, '../../public/503.html'));
} else {
diff --git a/src/middleware/render.js b/src/middleware/render.js
index c56a0d526b..f348236884 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -88,7 +88,7 @@ module.exports = function (middleware) {
if (req.route && req.route.path === '/api/') {
options.title = '[[pages:home]]';
}
- req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
+ req.app.set('json spaces', process.env.NODE_ENV === 'development' || req.query.pretty ? 4 : 0);
return res.json(options);
}
const optionsString = JSON.stringify(options).replace(/<\//g, '<\\/');
diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js
index 0b79e78f5f..a64b152b23 100644
--- a/src/plugins/hooks.js
+++ b/src/plugins/hooks.js
@@ -90,7 +90,7 @@ Hooks.unregister = function (id, hook, method) {
Hooks.fire = async function (hook, params) {
const hookList = plugins.loadedHooks[hook];
const hookType = hook.split(':')[0];
- if (global.env === 'development' && hook !== 'action:plugins.firehook' && hook !== 'filter:plugins.firehook') {
+ if (process.env.NODE_ENV === 'development' && hook !== 'action:plugins.firehook' && hook !== 'filter:plugins.firehook') {
winston.debug(`[plugins/fireHook] ${hook}`);
}
@@ -160,7 +160,7 @@ async function fireFilterHook(hook, hookList, params) {
async function fireMethod(hookObj, params) {
if (typeof hookObj.method !== 'function') {
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`);
}
return params;
@@ -185,7 +185,7 @@ async function fireActionHook(hook, hookList, params) {
}
for (const hookObj of hookList) {
if (typeof hookObj.method !== 'function') {
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`);
}
} else {
@@ -219,7 +219,7 @@ async function fireStaticHook(hook, hookList, params) {
async function fireMethod(hookObj, params) {
if (typeof hookObj.method !== 'function') {
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`);
}
return params;
@@ -256,7 +256,7 @@ async function fireResponseHook(hook, hookList, params) {
}
for (const hookObj of hookList) {
if (typeof hookObj.method !== 'function') {
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.warn(`[plugins] Expected method for hook '${hook}' in plugin '${hookObj.id}' not found, skipping.`);
}
} else {
diff --git a/src/plugins/index.js b/src/plugins/index.js
index f1265d4c7f..9fdc241eb9 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -78,12 +78,12 @@ Plugins.init = async function (nbbApp, nbbMiddleware) {
middleware = nbbMiddleware;
}
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.verbose('[plugins] Initializing plugins system');
}
await Plugins.reload();
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.info('[plugins] Plugins OK');
}
diff --git a/src/plugins/usage.js b/src/plugins/usage.js
index 69e3a44441..f36370b50f 100644
--- a/src/plugins/usage.js
+++ b/src/plugins/usage.js
@@ -18,7 +18,7 @@ module.exports = function (Plugins) {
};
Plugins.submitUsageData = async function () {
- if (!meta.config.submitPluginUsage || !Plugins.loadedPlugins.length || global.env !== 'production') {
+ if (!meta.config.submitPluginUsage || !Plugins.loadedPlugins.length || process.env.NODE_ENV !== 'production') {
return;
}
diff --git a/src/posts/cache.js b/src/posts/cache.js
index bb65026ae4..0953d6b84f 100644
--- a/src/posts/cache.js
+++ b/src/posts/cache.js
@@ -11,7 +11,7 @@ exports.getOrCreate = function () {
maxSize: meta.config.postCacheSize,
sizeCalculation: function (n) { return n.length || 1; },
ttl: 0,
- enabled: global.env === 'production',
+ enabled: process.env.NODE_ENV === 'production',
});
}
diff --git a/src/translator.js b/src/translator.js
index 8584686056..a9f9e888e0 100644
--- a/src/translator.js
+++ b/src/translator.js
@@ -3,7 +3,7 @@
const winston = require('winston');
function warn(msg) {
- if (global.env === 'development') {
+ if (process.env.NODE_ENV === 'development') {
winston.warn(msg);
}
}
diff --git a/src/webserver.js b/src/webserver.js
index 18f57faa40..fc54087daa 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -136,12 +136,12 @@ function setupExpressApp(app) {
});
app.set('view engine', 'tpl');
app.set('views', viewsDir);
- app.set('json spaces', global.env === 'development' ? 4 : 0);
+ app.set('json spaces', process.env.NODE_ENV === 'development' ? 4 : 0);
app.use(flash());
app.enable('view cache');
- if (global.env !== 'development') {
+ if (process.env.NODE_ENV !== 'development') {
app.enable('cache');
app.enable('minification');
}
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index a2c55f8d9e..2658cda500 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -13,7 +13,7 @@ const url = require('url');
const util = require('util');
process.env.NODE_ENV = process.env.TEST_ENV || 'production';
-global.env = process.env.NODE_ENV || 'production';
+
if (!process.env.hasOwnProperty('CI')) {
process.env.CI = 'true';
}
@@ -125,7 +125,7 @@ if (testDbConfig.database === productionDbConfig.database &&
nconf.set(dbType, testDbConfig);
winston.info('database config %s', dbType, testDbConfig);
-winston.info(`environment ${global.env}`);
+winston.info(`environment ${process.env.NODE_ENV}`);
const db = require('../../src/database');
diff --git a/test/posts.js b/test/posts.js
index 84befcbfa5..601774cd9e 100644
--- a/test/posts.js
+++ b/test/posts.js
@@ -729,8 +729,8 @@ describe('Post\'s', () => {
});
it('should store post content in cache', (done) => {
- const oldValue = global.env;
- global.env = 'production';
+ const oldValue = process.env.NODE_ENV;
+ process.env.NODE_ENV = 'production';
const postData = {
pid: 9999,
content: 'some post content',
@@ -739,7 +739,7 @@ describe('Post\'s', () => {
assert.ifError(err);
posts.parsePost(postData, (err) => {
assert.ifError(err);
- global.env = oldValue;
+ process.env.NODE_ENV = oldValue;
done();
});
});