joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #979 from ParsePlatform/flovilmart.SupportDashboardLikeConfig

Browse Source 
Adds support for apps key in config file, throws if length is > 1
This commit is contained in:
Florent Vilmart
2016-03-16 22:43:58 -04:00
parent 0f7335b534 86f93e39a7
commit 40812e2f53
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cli/parse-server.js
View File

@@ -9,7 +9,7 @@ program.loadDefinitions(definitions);
program program
.usage('[options] <path/to/configuration.json>'); .usage('[options] <path/to/configuration.json>');
program.on('--help', function(){ program.on('--help', function(){
console.log(' Get Started guide:'); console.log(' Get Started guide:');
console.log(''); console.log('');
@@ -31,19 +31,27 @@ program.on('--help', function(){
console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL'); console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL');
console.log(''); console.log('');
}); });
program.parse(process.argv, process.env); program.parse(process.argv, process.env);
let options = {}; let options = {};
if (program.args.length > 0 ) { if (program.args.length > 0 ) {
let jsonPath = program.args[0]; let jsonPath = program.args[0];
jsonPath = path.resolve(jsonPath); jsonPath = path.resolve(jsonPath);
options = require(jsonPath); let jsonConfig = require(jsonPath);
if (jsonConfig.apps) {
if (jsonConfig.apps.length > 1) {
throw 'Multiple apps are not supported';
}
options = jsonConfig.apps[0];
} else {
options = jsonConfig;
}
console.log(`Configuation loaded from ${jsonPath}`) console.log(`Configuation loaded from ${jsonPath}`)
} }
options = Object.keys(definitions).reduce(function (options, key) { options = Object.keys(definitions).reduce(function (options, key) {
if (program[key]) { if (typeof program[key] !== 'undefined') {
options[key] = program[key]; options[key] = program[key];
} }
return options; return options;
@@ -66,7 +74,7 @@ const api = new ParseServer(options);
app.use(options.mountPath, api); app.use(options.mountPath, api);
var server = app.listen(options.port, function() { var server = app.listen(options.port, function() {
for (let key in options) { for (let key in options) {
let value = options[key]; let value = options[key];
if (key == "masterKey") { if (key == "masterKey") {