From f8cab3eebdcee288332e16bda5bd6b2fa17e02ac Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Fri, 6 Apr 2018 12:41:29 -0400 Subject: 4.4.1 deployment-handler -unit tests 84% coverage - more logging on metrics - log both req and res - unit tests of policy-update API - log timing and messaging in unit tests - code coverage 84.28% Statements 938/1113 65.51% Branches 321/490 81.58% Functions 155/190 84.34% Lines 926/1098 Change-Id: I3587135ceac76b291f83753441421a917a8b8bdf Signed-off-by: Alex Shatov Issue-ID: DCAEGEN2-258 --- lib/policy.js | 2 +- lib/promise_request.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/policy.js b/lib/policy.js index d471cff..7c47dd3 100644 --- a/lib/policy.js +++ b/lib/policy.js @@ -26,7 +26,7 @@ const config = process.mainModule.exports.config; const createError = require('./dispatcher-error').createDispatcherError; const logger = require('./logging').getLogger(); -var cloudify = require("./cloudify.js"); +const cloudify = require("./cloudify.js"); // Set config for cloudify interface library cloudify.setAPIAddress(config.cloudify.url); diff --git a/lib/promise_request.js b/lib/promise_request.js index 68e8c2f..c34227d 100644 --- a/lib/promise_request.js +++ b/lib/promise_request.js @@ -113,16 +113,18 @@ exports.doRequest = function(mainReq, options, body, targetEntity) { } opInfo.respCode = resp.statusCode || 500; + const metrics_text = "res: " + result.body + + ((reqBody && " req: " + ((typeof(reqBody) !== 'string' && typeof(reqBody)) || reqBody)) || ""); if (resp.statusCode > 199 && resp.statusCode < 300) { // HTTP status code indicates success - resolve the promise opInfo.complete = true; - logger.metrics(mainReq, opInfo, result.body); + logger.metrics(mainReq, opInfo, metrics_text); resolve(result); } else { // Reject the promise opInfo.complete = false; - logger.metrics(mainReq, opInfo, result.body); + logger.metrics(mainReq, opInfo, metrics_text); reject(result); } -- cgit 1.2.3-korg