feat: remov extra ifs

Author: fiftin

services/tasks/RemoteJob.go

@@ -164,9 +164,7 @@ func (t *RemoteJob) Run(username string, incomingVersion *string, alias string)
 		return
 	}
 
-	if t.taskPool != nil && t.taskPool.state != nil {
-		t.taskPool.state.UpdateRuntimeFields(tsk)
-	}
+	t.taskPool.state.UpdateRuntimeFields(tsk)
 
 	startTime := tz.Now()
 

services/tasks/TaskPool.go

@@ -526,8 +526,8 @@ func (p *TaskPool) StopTask(targetTask db.Task, forceStop bool) error {
 		return err
 	}
 
-	if tsk == nil { // task not active, but exists in database
-
+	// task not active, but exists in database. For non-HA mode
+	if tsk == nil {
 		tsk = NewTaskRunner(targetTask, p, "", p.keyInstallationService)
 
 		err := tsk.populateDetails()
@@ -536,18 +536,19 @@ func (p *TaskPool) StopTask(targetTask db.Task, forceStop bool) error {
 		}
 		tsk.SetStatus(task_logger.TaskStoppedStatus)
 		tsk.createTaskEvent()
-	} else {
-		status := tsk.Task.Status
+		return nil
+	}
 
-		if forceStop {
-			tsk.SetStatus(task_logger.TaskStoppedStatus)
-		} else {
-			tsk.SetStatus(task_logger.TaskStoppingStatus)
-		}
+	status := tsk.Task.Status
 
-		if status == task_logger.TaskRunningStatus {
-			tsk.kill()
-		}
+	if forceStop {
+		tsk.SetStatus(task_logger.TaskStoppedStatus)
+	} else {
+		tsk.SetStatus(task_logger.TaskStoppingStatus)
+	}
+
+	if status == task_logger.TaskRunningStatus {
+		tsk.kill()
 	}
 
 	return nil

services/tasks/TaskRunner.go

@@ -103,10 +103,8 @@ func (t *TaskRunner) saveStatus() {
 	if err := t.pool.store.UpdateTask(t.Task); err != nil {
 		t.panicOnError(err, "Failed to update TaskRunner status")
 	}
-	// persist runtime fields in HA store
-	if t.pool != nil && t.pool.state != nil {
-		t.pool.state.UpdateRuntimeFields(t)
-	}
+
+	t.pool.state.UpdateRuntimeFields(t)
 }
 
 func (t *TaskRunner) kill() {