diff --git a/client/app/project/project.component.js b/client/app/project/project.component.js
index 2be3d65..563596d 100644
--- a/client/app/project/project.component.js
+++ b/client/app/project/project.component.js
@@ -75,8 +75,15 @@ export class ProjectComponent {
* @param project
*/
projectCtrl.deleteProject = function(project){
+ projectCtrl.msg = "Deleting Project....";
+ projectCtrl.msg_status = "info";
project.$remove(function(){
projectCtrl.getProjects();
+ projectCtrl.msg = "Project deleted successfully!";
+ projectCtrl.msg_status = "success";
+ }, function(errResponse){
+ projectCtrl.msg = "Project Deletion Failed. " + errResponse.data;
+ projectCtrl.msg_status = "danger";
})
};
diff --git a/client/app/project/project.html b/client/app/project/project.html
index bc4a5d1..943304a 100644
--- a/client/app/project/project.html
+++ b/client/app/project/project.html
@@ -21,7 +21,7 @@
-
+
Ansible Controller system - A linux system with Ansible Installed on it. Required if you want to execute Ansible playbooks. You could skip this and still generate playbooks but not test them.
diff --git a/server/api/project/project.controller.js b/server/api/project/project.controller.js
index 1dc2391..0759a90 100644
--- a/server/api/project/project.controller.js
+++ b/server/api/project/project.controller.js
@@ -66,7 +66,7 @@ function handleError(res, statusCode) {
statusCode = statusCode || 500;
return function(err) {
logger.error("Error = " + err);
- res.status(statusCode).send(err);
+ res.status(statusCode).send("Error = " + err);
};
}
diff --git a/server/components/ansible/ansible_tool.js b/server/components/ansible/ansible_tool.js
index 0c67691..4c7cac8 100644
--- a/server/components/ansible/ansible_tool.js
+++ b/server/components/ansible/ansible_tool.js
@@ -471,8 +471,8 @@ exports.deleteProjectFolder = function(project){
},(error_response) => {
deferred.reject(new Error(error_response));
},ansibleEngine);
- },() => {
- deferred.reject(new Error("Directory - " + project_folder +" does not exist."));
+ },(err) => {
+ deferred.reject(new Error(err || "Directory - " + project_folder +" does not exist."));
},ansibleEngine);
return deferred.promise;
diff --git a/server/components/ssh/ssh2_exec.js b/server/components/ssh/ssh2_exec.js
index 9894c4c..717c9f8 100644
--- a/server/components/ssh/ssh2_exec.js
+++ b/server/components/ssh/ssh2_exec.js
@@ -1,16 +1,10 @@
-var Client = require('ssh2').Client;
+const Client = require('ssh2').Client;
-//var exec = require('ssh-exec');
-
-var config = require('../../config/environment');
+const config = require('../../config/environment');
+const logger = require('../logger/logger');
exports.executeCommand = function(command, dataCallback,completeCallback,errorCallback, ansibleEngine, addScriptEndString){
- /*var fs = require('filendir');
- var time = new Date().getTime();
- //var logFile = 'logs/deploy/' + logfilename;
- var logFile = logfilelocation;*/
-
var conn = new Client();
if(!ansibleEngine) ansibleEngine = {};
@@ -32,22 +26,17 @@ exports.executeCommand = function(command, dataCallback,completeCallback,errorCa
scriptEngineConfig.privateKey = require('fs').readFileSync(config.scriptEngine.privateKey);
}
- //fs.appendFile(logFile,command);
- //console.log("Writing Command to log file =" + command)
- /*fs.writeFile(logFile,"\n",{'flag':'a'});*/
-
conn.on('keyboard-interactive', function(name, instr, lang, prompts, cb) {
cb([connHostPassword]);
});
conn.on('error', function(error) {
- console.log("SSH Connect Error" + error);
- errorCallback(error);
+ logger.error("SSH Connect Error" + error);
+ errorCallback("SSH Connect Error" + error);
});
conn.on('ready', function() {
- console.log('Client :: ready');
- console.log('Command :: ' + command);
+ logger.info('Client :: ready');
conn.exec(command, function(err, stream) {
var callBackSent = false;
@@ -56,15 +45,12 @@ exports.executeCommand = function(command, dataCallback,completeCallback,errorCa
var error = false;
if (err) {
- console.log("Error=" + err);
- errorCallback(err);
-
+ logger.error("Error=" + err);
+ errorCallback("Error=" + err);
}
stream.on('close', function(code, signal) {
- console.log('Stream :: close :: code: ' + code + ', signal: ' + signal);
- //completeCallback('Stream :: close :: code: ' + code + ', signal: ' + signal + '\nSCRIPT_FINISHED');
+ logger.info('Stream :: close :: code: ' + code + ', signal: ' + signal);
if(addScriptEndString){
- //dataCallback call is what writes to logfile
result_data += '\nSCRIPT_FINISHED';
dataCallback(result_data);
}
@@ -76,33 +62,19 @@ exports.executeCommand = function(command, dataCallback,completeCallback,errorCa
}
conn.end();
}).on('data', function(data) {
- console.log('STDOUT: ' + data);
+ logger.info('STDOUT: ' + data);
result_data += data;
if(dataCallback){
- //dataCallback(data);
dataCallback(result_data);
}
}).stderr.on('data', function(data) {
- console.log('STDERR: ' + data);
+ logger.error('STDERR: ' + data);
error_data += data;
error = true;
- //errorCallback(data);
});
});
}).connect(scriptEngineConfig);
};
-
-//exports.executeCommand(null,'python3.4 /data/ehc-builder/scripts/vipr/python/ehc-builder/scripts/bin/main.py vro all --inputfile="configure_vmware_vro_Mumshad_Mannambeth_1468092975124.in" --logfile="configure_vmware_vro_Mumshad_Mannambeth_1468092975124"', 'logs/deploy/configure_vmware_vro_Mumshad_Mannambeth_1468092975124.log' )
-/*
-
-exports.executeCommand(null,'date','testfile.log',function(response){
- console.log(response)
-},function(response){
- console.log(response)
-},function(response){
- console.log(response)
-})
-*/