Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/models/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function errorsAction(event) {

function validateAction(axn) {
var axnArr, axnElem, i;
if (util.isArray(axn)) {
if (Array.isArray(axn)) {
axnArr = axn;
} else {
axnArr = [axn];
Expand Down Expand Up @@ -241,7 +241,7 @@ function DoAction(event, callback) {
if (err) {
return callback(err, null);
}
if (!util.isArray(actions)) {
if (!Array.isArray(actions)) {
actions = [actions];
}
// check all axns are right
Expand Down
2 changes: 1 addition & 1 deletion lib/models/notices.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function DoNotice(orionN, callback) {
orionResponse = orionN.contextResponses;
}

if (!util.isArray(orionResponse)) {
if (!Array.isArray(orionResponse)) {
if (orionN.version === 2) {
return callback(new errors.InvalidV2Notice('data must be an array, not a ' + typeof orionResponse));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/models/rulesStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function findAll(service, subservice, callback) {
}
const col = db.collection(rulesCollectionName);
col.find(criterion).toArray(function(err, rules) {
if (rules && util.isArray(rules)) {
if (rules && Array.isArray(rules)) {
rules.forEach(function(r) {
parsePostAxnParams(r);
});
Expand Down
2 changes: 1 addition & 1 deletion lib/myutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function respondAux(resp, err, data, withCount, raw, withMetrics) {
} else {
// non-raw
respObj = { error: errMsg, data: data };
if (withCount === true && data && util.isArray(data)) {
if (withCount === true && data && Array.isArray(data)) {
respObj.count = data.length;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/actionsController.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function PostAction(req, resp) {
//There is no array yet for this correlator
rulesWithCorr = recentAxn[correlator] = [];
}
if (util.isArray(rulesWithCorr)) {
if (Array.isArray(rulesWithCorr)) {
if (rulesWithCorr.length > config.maxRulesByCorr) {
errMsg = util.format(
'maximun number of rules executed with the same correlator (%s) reached with these rules [%j]' +
Expand Down
3 changes: 1 addition & 2 deletions lib/routes/rulesController.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ var rules = require('../models/rules'),
constants = require('../constants'),
config = require('../../config'),
logger = require('logops'),
util = require('util'),
myutils = require('../myutils');

function GetAllRules(req, resp) {
Expand All @@ -36,7 +35,7 @@ function GetAllRules(req, resp) {
var count = req.query && req.query.options ? req.query.options === 'count' : true;
logger.debug({}, 'getting all rules');
rules.FindAll(req.service, req.subservice, function(err, data) {
if (util.isArray(data)) {
if (Array.isArray(data)) {
resp.set(constants.TOTAL_COUNT_HEADER, data.length);
data = data.splice(offset, limit);
var dataPurged = [];
Expand Down
5 changes: 2 additions & 3 deletions lib/routes/visualRulesController.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
*/
'use strict';

var util = require('util'),
visualRules = require('../models/visualRules'),
var visualRules = require('../models/visualRules'),
metrics = require('../models/metrics'),
config = require('../../config'),
constants = require('../constants'),
Expand All @@ -36,7 +35,7 @@ function GetAllVR(req, resp) {
var count = req.query && req.query.options ? req.query.options === 'count' : true;
logger.debug({}, 'getting all Vrules ');
visualRules.FindAll(req.service, req.subservice, function(err, data) {
if (!err && util.isArray(data)) {
if (!err && Array.isArray(data)) {
data = data.map(function(e) {
delete e.subservice;
delete e.service;
Expand Down
Loading