RIFT-14916: Code added but commented out for removing cat severity filter

[osm/UI.git] / skyquake / plugins / logging / api / logging.js

diff --git a/skyquake/plugins/logging/api/logging.js b/skyquake/plugins/logging/api/logging.js
index a3bc182..c2f56f8 100644 (file)
--- 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);
-      }
-    )
-  })
-
 }
 
 /*