aboutsummaryrefslogtreecommitdiffstats
path: root/lib/policy.js
diff options
context:
space:
mode:
Diffstat (limited to 'lib/policy.js')
-rw-r--r--lib/policy.js36
1 files changed, 23 insertions, 13 deletions
diff --git a/lib/policy.js b/lib/policy.js
index d6a701f..098a4a4 100644
--- a/lib/policy.js
+++ b/lib/policy.js
@@ -222,7 +222,7 @@ function update_policies(req, res) {
* retrieve the unique set of policies and policy-filters from cloudify
*/
function get_policies_from_cloudify(req, res, next) {
- logger.info(req.dcaeReqId, "getPoliciesFromCloudify " + req.originalUrl);
+ logger.info(req.dcaeReqId, "get_policies_from_cloudify " + req.originalUrl);
const response = {"requestID": req.dcaeReqId};
response.started = new Date();
response.server_instance_uuid = process.mainModule.exports.config.server_instance_uuid;
@@ -263,13 +263,16 @@ function get_policies_from_cloudify(req, res, next) {
.then(function(result) {
response.ended = new Date();
response.status = result.status;
- response.message = result.message;
- logger.info(req.dcaeReqId, result.message);
- if (result.status !== 200) {
- logger.error(createError(result.message, result.status, "api", 502, 'cloudify-manager'), req);
+ response.message = result.message
+ + " deployed policies[" + Object.keys(response.policies).length
+ + "] policy_filters[" + Object.keys(response.policy_filters).length + "]";
+ logger.info(req.dcaeReqId, "response status " + response.status
+ + " body: " + JSON.stringify(response));
+ if (response.status !== 200) {
+ logger.error(createError(response.message, response.status, "api", 502, 'cloudify-manager'), req);
}
- res.status(result.status).json(response);
- logger.audit(req, result.status, result.message);
+ res.status(response.status).json(response);
+ logger.audit(req, response.status, response.message);
});
}
@@ -335,13 +338,20 @@ function getComponentPoliciesFromCloudify(req, res, next) {
.then(function(result) {
response.ended = new Date();
response.status = result.status;
- response.message = result.message;
- logger.info(req.dcaeReqId, result.message);
- if (result.status !== 200) {
- logger.error(createError(result.message, result.status, "api", 502, 'cloudify-manager'), req);
+ response.message = result.message
+ response.message = result.message
+ + " collected[" + response.node_instance_ids.length
+ + "] node_instance_ids[" + Object.keys(response.node_instance_ids).length
+ + "] component_policies[" + Object.keys(response.component_policies).length
+ + "] component_policy_filters[" + Object.keys(response.component_policy_filters).length + "]";
+
+ logger.info(req.dcaeReqId, "response status " + response.status
+ + " body: " + JSON.stringify(response));
+ if (response.status !== 200) {
+ logger.error(createError(response.message, response.status, "api", 502, 'cloudify-manager'), req);
}
- res.status(result.status).json(response);
- logger.audit(req, result.status, result.message);
+ res.status(response.status).json(response);
+ logger.audit(req, response.status, response.message);
});
}