X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flogging%2Fapi%2Flogging.js;h=c2f56f834f45f65c73ba5ac6ad3357ce7a102be7;hp=a3bc182218bef640417b3850c0642acad82cb4f8;hb=660c2a10bd46b81968e3ed354ea4b3f218c90b29;hpb=58b264f094f5351c5662a6d5640e65ea890c14f4 diff --git a/skyquake/plugins/logging/api/logging.js b/skyquake/plugins/logging/api/logging.js index a3bc18221..c2f56f834 100644 --- a/skyquake/plugins/logging/api/logging.js +++ b/skyquake/plugins/logging/api/logging.js @@ -112,10 +112,10 @@ function requestCallback(resolve, reject, transformFunc) { } else { var data = JSON.stringify(response.body); } - return resolve_with_delay(resolve, { + return resolve({ statusCode: response.statusCode, data: data - }, 0); + }); }; }; } @@ -333,21 +333,21 @@ Config.setDefaultSyslogSeverity = function(req) { Config.deleteDefaultSyslogSeverity = function(req) { // TODO: verify there is one key at root of data: 'default-severity' // OR just filter on the request body - var Categories = req.body; + var Categories = req.params.nulledCategories.split(','); + var promises = []; return new Promise(function(resolve, reject) { - var promises = Categories.map(function(categoryName) { - return handleDeleteRequest(req, APIVersion + '/api/config/logging/sink/syslog/filter/category/' + categoryName); + promises.concat(Categories.map(function(categoryName) { + return handleDeleteRequest(req, APIVersion + '/api/config/logging/sink/syslog/filter/category/' + categoryName); + })); + return Promise.all(promises).then( + function(data) { + resolve({statusCode: data[0].statusCode, data: data[0].data}); + }, + function(data) { + reject({statusCode: data[0].statusCode, data: data[0].data}); + } + ) }); - return Promise.all(promises).then( - function(data) { - resolve(data[0]); - }, - function(data) { - reject(data); - } - ) - }) - } /*