fix(runner): scanner fix

Author: fiftin

services/runners/running_job.go

@@ -105,24 +105,28 @@ func (p *runningJob) logPipe(reader io.Reader) {
 		p.Log(line)
 	}
 
-	msg := "Failed to read TaskRunner output"
-
-	switch scanner.Err().Error() {
-	case "EOF",
-		"os: process already finished",
-		"read |0: file already closed":
-		return // it is ok
-	case "bufio.Scanner: token too long":
-		msg = "TaskRunner output exceeds the maximum allowed size of 10MB"
-		break
-	}
+	err := scanner.Err()
+
+	if err != nil {
+		msg := "Failed to read TaskRunner output"
 
-	p.job.Kill() // kill the job because stdout cannot be read.
+		switch err.Error() {
+		case "EOF",
+			"os: process already finished",
+			"read |0: file already closed":
+			return // it is ok
+		case "bufio.Scanner: token too long":
+			msg = "TaskRunner output exceeds the maximum allowed size of 10MB"
+			break
+		}
 
-	log.WithError(scanner.Err()).WithFields(log.Fields{
-		"task_id": p.job.Task.ID,
-		"context": "job",
-	}).Error(msg)
+		p.job.Kill() // kill the job because stdout cannot be read.
 
-	p.Log("Fatal error: " + msg)
+		log.WithError(err).WithFields(log.Fields{
+			"task_id": p.job.Task.ID,
+			"context": "task_logger",
+		}).Error(msg)
+
+		p.Log("Fatal error: " + msg)
+	}
 }

services/tasks/TaskRunner_logging.go

@@ -164,14 +164,12 @@ func (t *TaskRunner) logPipe(reader io.Reader) {
 
 	close(linesCh)
 
-	if scanner.Err() != nil {
-		if scanner.Err().Error() == "EOF" {
-			return // it is ok
-		}
+	err := scanner.Err()
 
+	if err != nil {
 		msg := "Failed to read TaskRunner output"
 
-		switch scanner.Err().Error() {
+		switch err.Error() {
 		case "EOF",
 			"os: process already finished",
 			"read |0: file already closed":
@@ -183,7 +181,7 @@ func (t *TaskRunner) logPipe(reader io.Reader) {
 
 		t.kill() // kill the job because stdout cannot be read.
 
-		log.WithError(scanner.Err()).WithFields(log.Fields{
+		log.WithError(err).WithFields(log.Fields{
 			"task_id": t.Task.ID,
 			"context": "task_logger",
 		}).Error(msg)