fix: merge conflict

Author: fiftin

pkg/task_logger/task_logger.go

@@ -2,6 +2,7 @@ package task_logger
 
 import (
 	"os/exec"
+	"strings"
 	"time"
 )
 
@@ -20,6 +21,24 @@ const (
 	TaskFailStatus          TaskStatus = "error"
 )
 
+func (s TaskStatus) String() string {
+	switch s {
+	case TaskWaitingStatus,
+		TaskStartingStatus,
+		TaskWaitingConfirmation,
+		TaskConfirmed,
+		TaskRejected,
+		TaskRunningStatus,
+		TaskStoppingStatus,
+		TaskStoppedStatus,
+		TaskSuccessStatus,
+		TaskFailStatus:
+		return string(s)
+	default:
+		return "unknown"
+	}
+}
+
 func (s TaskStatus) IsValid() bool {
 	switch s {
 	case TaskWaitingStatus,
@@ -55,8 +74,10 @@ func (s TaskStatus) Format() (res string) {
 	default:
 		res += "❓"
 	}
+
 	// to avoid email content injection issue
-	//res += strings.ToUpper(string(s))
+	res += strings.ToUpper(s.String())
+
 	return
 }