From f839cf81544802b9803cb01b5ba0bb106b90f0fc Mon Sep 17 00:00:00 2001 From: Sam Calder-Mason Date: Tue, 17 Jul 2018 15:10:42 +1000 Subject: [PATCH] Settings use argparser as first preference --- SettingsHelper.js | 3 ++- webapp.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsHelper.js b/SettingsHelper.js index b9147515..63fa2e50 100644 --- a/SettingsHelper.js +++ b/SettingsHelper.js @@ -1,5 +1,6 @@ var jsonfile = require('jsonfile') +const args = require('args-parser')(process.argv) module.exports = function () { const fields = [ @@ -25,7 +26,7 @@ module.exports = function () { let defaults = require('./example_settings.json') for (let i = 0; i < fields.length; i++) { let setting = fields[i] - output[setting] = process.env[setting] || settingsFile[setting] || defaults[setting] + output[setting] = args[setting] || process.env[setting] || settingsFile[setting] || defaults[setting] } return output } diff --git a/webapp.js b/webapp.js index 892e2325..839dd174 100644 --- a/webapp.js +++ b/webapp.js @@ -21,7 +21,7 @@ const bootstrap = () => { return new Promise(async (resolve, reject) => { const args = require('args-parser')(process.argv) if (!settings.accessUrl) { - console.log('Missing required argument -accessUrl. EG. "node webapp.js --accessUrl=http://sl.example.com". This URL is used for redirecting invite links.') + console.log('Missing required argument -accessUrl. EG. "node webapp.js -accessUrl=http://sl.example.com". This URL is used for redirecting invite links.') return reject(new Error('Missing URL for invite links')) } accessIp = settings.accessUrl// EG 'http://95.231.444.12:8088/slweb' or 'http://example.com/slweb'