From f816c3934c260a2b9596e106063270554c8d93b4 Mon Sep 17 00:00:00 2001
From: miraclesu <suchuangji@gmail.com>
Date: Fri, 21 Apr 2017 15:28:01 +0800
Subject: [PATCH] =?UTF-8?q?noticer:=20=E6=9B=B4=E8=AF=A6=E7=BB=86=E7=9A=84?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

结点失败通知加上通知人
---
 models/job.go     | 17 ++++++++++++++++-
 models/noticer.go |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/models/job.go b/models/job.go
index f81a81a..0490f25 100644
--- a/models/job.go
+++ b/models/job.go
@@ -550,12 +550,14 @@ func (j *Job) Notify(t time.Time, msg string) {
 
 	ts := t.Format(time.RFC3339)
 	body := "job: " + j.Key() + "\n" +
+		"job name: " + j.Name + "\n" +
+		"job cmd: " + j.Command + "\n" +
 		"node: " + j.runOn + "\n" +
 		"time: " + ts + "\n" +
 		"err: " + msg
 
 	m := Message{
-		Subject: "node[" + j.runOn + "] job[" + j.ID + "] time[" + ts + "] exec failed",
+		Subject: "node[" + j.runOn + "] job[" + j.ShortName() + "] time[" + ts + "] exec failed",
 		Body:    body,
 		To:      j.To,
 	}
@@ -683,3 +685,16 @@ func (j *Job) ValidRules() error {
 	}
 	return nil
 }
+
+func (j *Job) ShortName() string {
+	if len(j.Name) <= 10 {
+		return j.Name
+	}
+
+	names := []rune(j.Name)
+	if len(names) <= 10 {
+		return j.Name
+	}
+
+	return string(names[:10]) + "..."
+}
diff --git a/models/noticer.go b/models/noticer.go
index d3e0a87..cc15068 100644
--- a/models/noticer.go
+++ b/models/noticer.go
@@ -191,6 +191,7 @@ func monitorNodes(n Noticer) {
 				if ok {
 					n.Send(&Message{
 						Subject: "node[" + id + "] fault at time[" + time.Now().Format(time.RFC3339) + "]",
+						To:      conf.Config.Mail.To,
 					})
 				}
 			}