From 571929e914ec761e513c43463beae3883936abc8 Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Mon, 3 Oct 2016 11:27:49 +0530 Subject: [PATCH 1/2] Implemted the Docker container status --- server/app/routes/v1.0/routes_instances.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app/routes/v1.0/routes_instances.js b/server/app/routes/v1.0/routes_instances.js index a6f092e13..18bfb760b 100755 --- a/server/app/routes/v1.0/routes_instances.js +++ b/server/app/routes/v1.0/routes_instances.js @@ -858,7 +858,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { projectName: instance[0].projectName, envName: instance[0].environmentName, envId: instance[0].envId, - status: containers[0].Status, + status: action.charAt(0).toUpperCase() + action.slice(1), actionStatus: "pending", instanceIP:instance[0].instanceIP, platformId: instance[0].platformId, From 10aaba2f01d84e25b90d6b1836b60eaecdabe06d Mon Sep 17 00:00:00 2001 From: VIJAYKUMARNINGANURE Date: Mon, 3 Oct 2016 12:56:57 +0530 Subject: [PATCH 2/2] Implemented the Action of Docker container Audit Trail --- .../app/cronjobs/docker-container-sync/DockerContainerSync.js | 4 ++-- server/app/routes/v1.0/routes_instances.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/app/cronjobs/docker-container-sync/DockerContainerSync.js b/server/app/cronjobs/docker-container-sync/DockerContainerSync.js index 019376f69..b0a935fa1 100644 --- a/server/app/cronjobs/docker-container-sync/DockerContainerSync.js +++ b/server/app/cronjobs/docker-container-sync/DockerContainerSync.js @@ -243,7 +243,7 @@ function saveAndUpdateContainers(containers,containerIds,instanceId,instance,nex }else{ count++; - var actionObj = 'Docker-Container Start' + ' : ' + container.Names; + var actionObj = 'Start'; var timestampStarted = new Date().getTime(); var actionLog = instancesDao.insertDockerActionLog(instanceId, instance.catUser, actionObj, 1, timestampStarted); var logReferenceIds = [instance._id, actionLog._id]; @@ -349,7 +349,7 @@ function deleteContainerByInstanceId(instanceDetails,next){ for(var i = 0; i < containerList.length;i++){ (function(container){ var timestampStarted = new Date().getTime(); - var actionObj = 'Docker-Container Terminated : ' + container.Names; + var actionObj = 'Terminated'; var actionLog = instancesDao.insertDockerActionLog(instanceDetails._id,instanceDetails.catUser , actionObj, 6, timestampStarted); var logReferenceIds = [instanceDetails._id, actionLog._id]; logsDao.insertLog({ diff --git a/server/app/routes/v1.0/routes_instances.js b/server/app/routes/v1.0/routes_instances.js index 18bfb760b..623a90fe9 100755 --- a/server/app/routes/v1.0/routes_instances.js +++ b/server/app/routes/v1.0/routes_instances.js @@ -831,7 +831,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { res.send(500); return; } - var actionObj = 'Docker-Container '+action.charAt(0).toUpperCase() + action.slice(1) + ' : ' + containers[0].Names[0]; + var actionObj = action.charAt(0).toUpperCase() + action.slice(1) ; instancesDao.getInstanceById(req.params.instanceid, function (err, instance) { if (err) { logger.error("Instance fetch Failed >> ", err);