diff options
Diffstat (limited to 'lib/services.js')
| -rw-r--r-- | lib/services.js | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/lib/services.js b/lib/services.js index 5a2a7d7..9508efd 100644 --- a/lib/services.js +++ b/lib/services.js @@ -22,6 +22,8 @@ const ejs = require('ejs'); const deploy = require('./deploy'); const inventory = require('./inventory'); const config = process.mainModule.exports.config; +const logError = require('./logging').logError; +const logAudit = require('./logging').logAccess; /* Set up logging */ var logger = config.logSource.getLogger("services"); @@ -35,7 +37,7 @@ exports.createDeployer = function(req) { return function(blueprint) { /* Generate a deploymentId */ - let deploymentId = blueprint.deploymentId; + var deploymentId = blueprint.deploymentId; /* Attempt the deployment */ logger.info(req.dcaeReqId + " " + "Attempting to deploy deploymentId " + deploymentId); @@ -59,10 +61,14 @@ exports.createDeployer = function(req) { ); }) .then(function(result) { - logger.info(req.dcaeReqId + " Updated inventory for deploymentId: " + deploymentId); + logAudit(req, 200, "Deployed id: " + deploymentId); }) .catch(function(err) { - logger.error(req.dcaeReqId + " Failed to deploy deploymentId: " + deploymentId + " Error: " + JSON.stringify(err)); + /* err should be a standard dispatcher error generated by the deploy or inventory modules */ + /* Enrich the message with the deployment ID */ + err.message = "Error deploying " + deploymentId + ": " + err.message; + logError(err, req); + logAudit(req, 500, err.message); //TODO try uninstall? }); }; @@ -87,10 +93,14 @@ exports.createUndeployer = function(req) { return inventory.deleteService(deployment.deploymentId); }) .then(function(result){ - logger.info(req.dcaeReqId + " Deleted service from inventory for deploymentId: " + deployment.deploymentId); + logAudit(req, 200, "Undeployed id: " + deployment.deploymentId); }) .catch(function(err){ - logger.error(req.dcaeReqId + " Error undeploying " + deployment.deploymentId + ": " + JSON.stringify(err)); + /* err should be a standard dispatcher error generated by the deploy or inventory modules */ + /* Enrich the message with the deployment ID */ + err.message = "Error undeploying " + deployment.deploymentId + ": " + err.message; + logError(err, req); + logAudit(req, 500, err.message); }); }; |