Skip to content

CAT-2263,CAT-2264 and CAT-65 Fixed #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 25, 2016
Merged

CAT-2263,CAT-2264 and CAT-65 Fixed #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
14f806b
Provider Remove Issue
Durgesh1988 Aug 22, 2016
a2c97f1
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Aug 23, 2016
4faaa67
CAT-2263 and CAT-2264 Fixed
Durgesh1988 Aug 24, 2016
f387476
CAT-2264 Fixed
Durgesh1988 Aug 25, 2016
7ef5ce5
CAT-2264 Fixed
Durgesh1988 Aug 25, 2016
77c0562
CAT-2263 Fixed
Durgesh1988 Aug 25, 2016
23b4e7a
CAT-2238 Fixed
Durgesh1988 Aug 25, 2016
f9719eb
CAT-2249 Fixed
Durgesh1988 Aug 25, 2016
3a2f2de
CAT-2249 Fixed
Durgesh1988 Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/htmls/public/instanceLog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ <h4 class="modal-title" id="myModalLabel">
if(managnedData[i].platformId) {
instanceId = managnedData[i].platformId;
} else {
instanceId = managnedData[i].instanceId;
instanceId = managnedData[i].blueprintName;
}
var $tr = $('<tr class="instanceLogTrail"></tr>').attr('data-id', instanceId);
var createdOn = new Date(managnedData[i].createdOn).toLocaleString();
Expand Down
18 changes: 9 additions & 9 deletions client/htmls/public/orchestrationLog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ <h4 class="modal-title" id="myModalLabel">
//Showing the log for Tasks
function pollLogs(timestamp, delay, clearData) {
var url = '/audit-trail/task-action/' + taskActionId+'/logs';
url = url + '?timestamp=' + timestamp;
url = url + '?timestamp='+timestamp;
timeout = setTimeout(function() {
$.ajax({
url: url,
Expand All @@ -195,25 +195,25 @@ <h4 class="modal-title" id="myModalLabel">
$modalBody.empty();
}
var $table = $('<table></table>');
for (var i = 0; i < data.logs.length; i++) {
for (var i = 0; i < data.length; i++) {
var $rowDiv = $('<tr class="row rowSpacing"></tr>');
var timeString;
if(data.logs[i].timestamp){
timeString = new Date().setTime(data.logs[i].timestamp);
if(data[i].timestamp){
timeString = new Date().setTime(data[i].timestamp);
}
var date = new Date(timeString).toLocaleString();
var logStr ="";
if(data.logs[i].log){
logStr = data.logs[i].log;
if(data[i].log){
logStr = data[i].log;
}
if (data.logs[i].err) {
if (data[i].err) {
$rowDiv.append($('<td class="col-lg-12 col-sm-12" style="color:red;"></td>').append('<span class="textLogs">' + date + '</span>' + '&nbsp;&nbsp;&nbsp;' + '<span>' + logStr + '</span>'));
} else {
$rowDiv.append($('<td class="col-lg-12 col-sm-12" style="color:DarkBlue;"></td>').append('<span class="textLogs">' + date + '</span>' + '&nbsp;&nbsp;&nbsp;' + '<span>' + logStr + '</span>'));
}
$table.append($rowDiv);
lastTimestamp = data.logs[i].timestamp;
if (data.logs[i]) {
lastTimestamp = data[i].timestamp;
if (data[i]) {
$modalBody.append($table);
$modalBody.scrollTop($modalBody[0].scrollHeight + 100);
}
Expand Down
126 changes: 34 additions & 92 deletions server/app/cronjobs/docker-container-sync/DockerContainerSync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,101 +16,43 @@ DockerContainerSync.execute = dockerContainerSync;

module.exports = DockerContainerSync;

function dockerContainerSync(){
async.parallel({
containerDataSync: function(callback){
containerDao.getAllContainers(function(err,containers){
if(err){
logger.error(err);
callback(err,null);
return;
}else if(containers.length > 0){
var count = 0;
for(var i = 0;i < containers.length; i++){
(function(container){
instancesDao.getInstanceById(container.instanceId,function(err,instances){
count++;
if(err) {
logger.error(err);
return;
}else if(instances.length > 0){
if(count === containers.length){
callback(null,containers);
return;
}
}else{
containerDao.deleteContainerByInstanceId(container.instanceId,function(err,deleteStatus){
if(err){
logger.error(err);
return;
}
if(count === containers.length){
callback(null,containers);
return;
}
})
}
})
})(containers[i]);
}
}else{
logger.info("Containers are not present in catalyst for instance sync");
callback(null,containers);
return;
}
})
},
instanceDataSync: function(callback){
MasterUtils.getAllActiveOrg(function(err, orgs) {
if(err) {
logger.error(err);
callback(err,null);
return;
}else if(orgs.length > 0){
for(var i = 0; i < orgs.length; i++){
(function(org){
instancesDao.getInstancesWithContainersByOrgId(org.rowid, function(err, instances) {
if(err) {
logger.error(err);
callback(err,null);
return;
}else if(instances.length > 0){
var count = 0;
for(var j = 0; j < instances.length; j++){
(function(instance){
count++;
aggregateDockerContainerForInstance(instance)
})(instances[j]);
}
if(count === instances.length){
callback(null,instances);
return;
}
}else{
logger.info("There is no Instance in "+org.orgname+" Organization who have docker installed");
callback(null,instances);
return;
}
});

})(orgs[i]);
}

}else{
logger.info("There is no Active Organization for Docker Container Sync");
callback(null,orgs);
return;
}
});
}
},function(err,results){
if(err){
function dockerContainerSync() {
MasterUtils.getAllActiveOrg(function (err, orgs) {
if (err) {
logger.error(err);
return;
} else if (orgs.length > 0) {
for (var i = 0; i < orgs.length; i++) {
(function (org) {
instancesDao.getInstancesWithContainersByOrgId(org.rowid, function (err, instances) {
if (err) {
logger.error(err);
return;
} else if (instances.length > 0) {
var count = 0;
for (var j = 0; j < instances.length; j++) {
(function (instance) {
count++;
aggregateDockerContainerForInstance(instance)
})(instances[j]);
}
if (count === instances.length) {
return;
}
} else {
logger.info("There is no Instance in " + org.orgname + " Organization who have docker installed");
return;
}
});
})(orgs[i]);
}
} else {
logger.info("There is no Active Organization for Docker Container Sync");
return;
}
logger.info("Docker Container Sync job is successfully executed");
return;
});
}
};


function aggregateDockerContainerForInstance(instance){
logger.info("Docker Container Sync started for Instance IP "+instance.instanceIP);
Expand Down
Loading