diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cloudify.js | 4 | ||||
| -rw-r--r-- | lib/logging.js | 5 | ||||
| -rw-r--r-- | lib/policy.js | 8 | ||||
| -rw-r--r-- | lib/utils.js | 6 |
4 files changed, 12 insertions, 11 deletions
diff --git a/lib/cloudify.js b/lib/cloudify.js index e0683bf..77e6d72 100644 --- a/lib/cloudify.js +++ b/lib/cloudify.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2017-2019 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -389,7 +389,7 @@ exports.getNodeInstances = function (mainReq, on_next_node_instances, offset) { offset = offset || 0; const reqOptions = { method : "GET", - uri : cfyAPI + "/node-instances?_include=id,deployment_id,runtime_properties&_size=1000&_offset=" + offset + uri : cfyAPI + "/node-instances?_include=id,deployment_id,runtime_properties&_sort=id&_size=1000&_offset=" + offset }; addAuthToOptions(reqOptions, mainReq); diff --git a/lib/logging.js b/lib/logging.js index 8d94f87..5c99ec2 100644 --- a/lib/logging.js +++ b/lib/logging.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -270,5 +270,6 @@ exports.getLogger = function() { }; exports.setLevel = function(level) { - log4js.setGlobalLogLevel(level); + level = (level || 'debug').toLowerCase(); + debugLogger.level = level; }; diff --git a/lib/policy.js b/lib/policy.js index 098a4a4..4d56096 100644 --- a/lib/policy.js +++ b/lib/policy.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -172,7 +172,7 @@ function update_policies(req, res) { const latest_policy = policy_update.latest_policies[policy_id]; if (!latest_policy || !latest_policy.policy_body - || isNaN(latest_policy.policy_body.policyVersion)) {return;} + || latest_policy.policy_body.policyVersion == null) {return;} if (!deployment.is_deployment_busy && latest_policy.policy_body.policyVersion === (deployed_policy.policy_body && deployed_policy.policy_body.policyVersion)) {return;} @@ -189,7 +189,7 @@ function update_policies(req, res) { const latest_policy = policy_update.latest_policies[policy_id]; const policy_body = latest_policy && latest_policy.policy_body; - if (!policy_body || isNaN(policy_body.policyVersion)) {return;} + if (!policy_body || policy_body.policyVersion == null) {return;} have_policies = true; deployment.added_policies[policy_filter_id] = deployment.added_policies[policy_filter_id] || { @@ -241,7 +241,7 @@ function get_policies_from_cloudify(req, res, next) { "policy_versions": {} }; const policy = node_instance.runtime_properties.policies[policy_id]; - if (policy.policy_body && policy.policy_body.policyVersion) { + if (policy.policy_body && policy.policy_body.policyVersion != null) { deployed_policy.policy_versions[policy.policy_body.policyVersion] = true; } deployed_policy.pending_update = deployed_policy.pending_update || pending_update; diff --git a/lib/utils.js b/lib/utils.js index 8caf280..b4558bd 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations "use strict"; -const uuid = require('uuid/v4'); +const uuid = require('uuid'); // Utility functions @@ -35,7 +35,7 @@ exports.hasProperty = function(o, key) { /* Generate a random ID string */ exports.generateId = function() { - return uuid(); + return uuid.v4(); }; const hide_fields = ["passphrase", "pfx"]; |