From ded53cf45cc8ead718f7dc1917cacdd9df6a86cc Mon Sep 17 00:00:00 2001 From: tigerbot Date: Thu, 5 Oct 2017 18:10:59 -0600 Subject: [PATCH] reduced a few lines of code --- bin/goldilocks.js | 3 +-- lib/admin/apis.js | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/bin/goldilocks.js b/bin/goldilocks.js index 456e9a9..ea936b6 100755 --- a/bin/goldilocks.js +++ b/bin/goldilocks.js @@ -36,7 +36,7 @@ function fixRawConfig(config) { } list.forEach(function (mod) { if (!mod.id) { - mod.id = crypto.randomBytes(8).toString('hex'); + mod.id = crypto.randomBytes(4).toString('hex'); updated = true; } }); @@ -153,7 +153,6 @@ async function checkConfigLocation(cwd, configFile) { , path.resolve(cwd, 'goldilocks.json') , path.resolve(cwd, 'etc/goldilocks/goldilocks.yml') , '/etc/goldilocks/goldilocks.yml' - , path.resolve(cwd, 'goldilocks.yml') ]; var ind; diff --git a/lib/admin/apis.js b/lib/admin/apis.js index 0a3a7c9..902ec15 100644 --- a/lib/admin/apis.js +++ b/lib/admin/apis.js @@ -421,12 +421,10 @@ module.exports.create = function (deps, conf) { app.use('/', isAuthorized, jsonParser); app.use( '/config', makeCorsHandler()); - app.get( '/config', config.restful.readConfig); - app.get( '/config/:group', config.restful.readConfig); - app.get( '/config/:group/:name(modules|domains)', config.restful.readConfig); - app.get( '/config/:group/:name(modules|domains)/:id', config.restful.readConfig); - app.get( '/config/:group/:name(domains)/:id/:name2(modules)', config.restful.readConfig); - app.get( '/config/:group/:name(domains)/:id/:name2(modules)/:id2', config.restful.readConfig); + app.get( '/config', config.restful.readConfig); + app.get( '/config/:group', config.restful.readConfig); + app.get( '/config/:group/:name(modules|domains)/:id?', config.restful.readConfig); + app.get( '/config/:group/:name(domains)/:id/:name2(modules)/:id2?', config.restful.readConfig); app.post( '/config', config.restful.saveConfig); return app; };