Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 07:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

automatically lowercasing env vars in nconf, fixes #2544

Browse Source
This commit is contained in:
Julian Lam
2017-06-22 11:10:23 -04:00
parent 9a06604968
commit d98b3e8056
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.js
View File

@@ -26,7 +26,10 @@ if (require.main !== module) {
}
var nconf = require('nconf');
nconf.argv().env('__');
nconf.argv().env({
separator: '__',
lowerCase: true,
});
var url = require('url');
var async = require('async');

2
loader.js
View File

@@ -142,7 +142,7 @@ function getPorts() {
process.exit();
}
var urlObject = url.parse(_url);
var port = nconf.get('port') || nconf.get('PORT') || urlObject.port || 4567;
var port = nconf.get('port') || urlObject.port || 4567;
if (!Array.isArray(port)) {
port = [port];
}

2
package.json
View File

@@ -60,7 +60,7 @@
"nodebb-plugin-emoji-extended": "1.1.1",
"nodebb-plugin-emoji-one": "1.2.1",
"nodebb-plugin-markdown": "7.1.1",
"nodebb-plugin-mentions": "2.0.3",
"nodebb-plugin-mentions": "2.1.1",
"nodebb-plugin-soundpack-default": "1.0.0",
"nodebb-plugin-spam-be-gone": "0.5.0",
"nodebb-rewards-essentials": "0.0.9",

2
src/start.js
View File

@@ -98,7 +98,7 @@ function setupConfigs() {
nconf.set('secure', urlObject.protocol === 'https:');
nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', relativePath);
nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
nconf.set('port', urlObject.port || nconf.get('port') || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
nconf.set('upload_url', '/assets/uploads');
}

1
src/webserver.js
View File

@@ -231,6 +231,7 @@ function setupAutoLocale(app, callback) {
function listen(callback) {
callback = callback || function () { };
console.log('derp', nconf.get('port'));
var port = parseInt(nconf.get('port'), 10);
var isSocket = isNaN(port);
var socketPath = isSocket ? nconf.get('port') : '';

2
test/mocks/databasemock.js
View File

@@ -110,7 +110,7 @@ before(function (done) {
nconf.set('secure', urlObject.protocol === 'https:');
nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', relativePath);
nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
nconf.set('port', urlObject.port || nconf.get('port') || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
nconf.set('upload_path', path.join(nconf.get('base_dir'), nconf.get('upload_path')));
nconf.set('core_templates_path', path.join(__dirname, '../../src/views'));