Merge branch 'master' of github.com:distribworks/dkron

distribworks · Jan 4, 2020 · fa9c091 · fa9c091
2 parents 88a4a5c + 95efe8a
commit fa9c091
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/dkron/notifier.go b/dkron/notifier.go
@@ -9,6 +9,7 @@ import (
 	"net/textproto"
 	"strings"
 	"text/template"
+	"time"
 
 	"github.com/jordan-wright/email"
 	"github.com/sirupsen/logrus"
@@ -74,17 +75,17 @@ func (n *Notifier) buildTemplate(templ string) *bytes.Buffer {
 		Report        string
 		JobName       string
 		ReportingNode string
-		StartTime     string
-		FinishedAt    string
+		StartTime     time.Time
+		FinishedAt    time.Time
 		Success       string
 		NodeName      string
 		Output        string
 	}{
 		n.report(),
 		n.Execution.JobName,
 		n.Config.NodeName,
-		fmt.Sprintf("%s", n.Execution.StartedAt),
-		fmt.Sprintf("%s", n.Execution.FinishedAt),
+		n.Execution.StartedAt,
+		n.Execution.FinishedAt,
 		fmt.Sprintf("%t", n.Execution.Success),
 		n.Execution.NodeName,
 		fmt.Sprintf("%s", n.Execution.Output),

diff --git a/dkron/notifier_test.go b/dkron/notifier_test.go
@@ -146,12 +146,12 @@ var templateTestCases = func(n *Notifier) []templateTestCase {
 		},
 		{
 			desc:     "StartTime template variable",
-			exp:      fmt.Sprintf("%s", n.Execution.StartedAt),
+			exp:      n.Execution.StartedAt.String(),
 			template: "{{.StartTime}}",
 		},
 		{
 			desc:     "FinishedAt template variable",
-			exp:      fmt.Sprintf("%s", n.Execution.FinishedAt),
+			exp:      n.Execution.FinishedAt.String(),
 			template: "{{.FinishedAt}}",
 		},
 		{