Rooba
/
synclounge
mirror of https://github.com/synclounge/synclounge.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Settings use argparser as first preference

This commit is contained in:
Sam Calder-Mason 2018-07-17 15:10:42 +10:00
parent e2d9504d1d
commit f839cf8154
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SettingsHelper.js
View File

@ -1,5 +1,6 @@
var jsonfile = require('jsonfile') var jsonfile = require('jsonfile')
const args = require('args-parser')(process.argv)
module.exports = function () { module.exports = function () {
const fields = [ const fields = [
@ -25,7 +26,7 @@ module.exports = function () {
let defaults = require('./example_settings.json') let defaults = require('./example_settings.json')
for (let i = 0; i < fields.length; i++) { for (let i = 0; i < fields.length; i++) {
let setting = fields[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 return output
} }

2
webapp.js
View File

@ -21,7 +21,7 @@ const bootstrap = () => {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const args = require('args-parser')(process.argv) const args = require('args-parser')(process.argv)
if (!settings.accessUrl) { 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')) 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' accessIp = settings.accessUrl// EG 'http://95.231.444.12:8088/slweb' or 'http://example.com/slweb'