Merge branch '2-13-stable' into 2-14-stable

Author: fiftin

services/tasks/LocalJob.go

@@ -17,29 +17,35 @@ import (
 )
 
 type LocalJob struct {
-	// Received constant fields
 	Task        db.Task
 	Template    db.Template
 	Inventory   db.Inventory
 	Repository  db.Repository
 	Environment db.Environment
-	Secret      string
-	Logger      task_logger.Logger
+	Secret      string             // Secret contains secrets received from Survey variables
+	Logger      task_logger.Logger // Logger allows to send logs and status to the server
 
 	App db_lib.LocalApp
 
-	// Internal field
+	killed  bool // killed means that API request to stop the job has been received
 	Process *os.Process
 
 	sshKeyInstallation     db.AccessKeyInstallation
 	becomeKeyInstallation  db.AccessKeyInstallation
 	vaultFileInstallations map[string]db.AccessKeyInstallation
 }
 
+func (t *LocalJob) IsKilled() bool {
+	return t.killed
+}
+
 func (t *LocalJob) Kill() {
+	t.killed = true
+
 	if t.Process == nil {
 		return
 	}
+
 	err := t.Process.Kill()
 	if err != nil {
 		t.Log(err.Error())
@@ -585,6 +591,11 @@ func (t *LocalJob) Run(username string, incomingVersion *string, alias string) (
 		}
 	}
 
+	if t.killed {
+		t.SetStatus(task_logger.TaskStoppedStatus)
+		return nil
+	}
+
 	return t.App.Run(db_lib.LocalAppRunningArgs{
 		CliArgs:         args,
 		EnvironmentVars: environmentVariables,

services/tasks/RemoteJob.go

@@ -16,6 +16,7 @@ type RemoteJob struct {
 	RunnerTag *string
 	Task      db.Task
 	taskPool  *TaskPool
+	killed    bool
 }
 
 type runnerWebhookPayload struct {
@@ -162,5 +163,10 @@ func (t *RemoteJob) Run(username string, incomingVersion *string, alias string)
 }
 
 func (t *RemoteJob) Kill() {
+	t.killed = true
 	// Do nothing because you can't kill remote process
 }
+
+func (t *RemoteJob) IsKilled() bool {
+	return t.killed
+}

services/tasks/TaskRunner.go

@@ -19,6 +19,7 @@ import (
 type Job interface {
 	Run(username string, incomingVersion *string, alias string) error
 	Kill()
+	IsKilled() bool
 }
 
 type TaskRunner struct {
@@ -177,8 +178,12 @@ func (t *TaskRunner) run() {
 	err = t.job.Run(username, incomingVersion, t.Alias)
 
 	if err != nil {
-		t.Log("Running app failed: " + err.Error())
-		t.SetStatus(task_logger.TaskFailStatus)
+		if t.job.IsKilled() {
+			t.SetStatus(task_logger.TaskStoppedStatus)
+		} else {
+			t.Log("Running app failed: " + err.Error())
+			t.SetStatus(task_logger.TaskFailStatus)
+		}
 		return
 	}