From 2632648d46082ff73ff17d41fcdc6e29f912950d Mon Sep 17 00:00:00 2001
From: miraclesu <suchuangji@gmail.com>
Date: Thu, 23 Feb 2017 15:59:21 +0800
Subject: [PATCH] =?UTF-8?q?node:=20=E6=8F=90=E5=8F=96=20group=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node/node.go | 69 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/node/node.go b/node/node.go
index 5a26bfc..0e2815b 100644
--- a/node/node.go
+++ b/node/node.go
@@ -251,38 +251,48 @@ func (n *Node) modGroup(g *models.Group) {
 
 	// 增加当前节点
 	if !oGroup.Included(n.ID) && g.Included(n.ID) {
-		n.groups[g.ID] = g
-		jls := n.link[g.ID]
-		if len(jls) == 0 {
-			return
-		}
-
-		var err error
-		for jid, jl := range jls {
-			job, ok := n.jobs[jid]
-			if !ok {
-				// job 已删除
-				if n.delIDs[jid] {
-					n.link.delGroupJob(g.ID, jid)
-					continue
-				}
-
-				if job, err = models.GetJob(jl.gname, jid); err != nil {
-					log.Warnf("get job[%s][%s] err: %s", jl.gname, jid, err.Error())
-					n.link.delGroupJob(g.ID, jid)
-					continue
-				}
-			}
-
-			cmds := job.Cmds(n.ID, n.groups)
-			for _, cmd := range cmds {
-				n.addCmd(cmd, true)
-			}
-		}
+		n.groupAddNode(g)
 		return
 	}
 
 	// 移除当前节点
+	n.groupRmNode(g, oGroup)
+	return
+}
+
+func (n *Node) groupAddNode(g *models.Group) {
+	n.groups[g.ID] = g
+	jls := n.link[g.ID]
+	if len(jls) == 0 {
+		return
+	}
+
+	var err error
+	for jid, jl := range jls {
+		job, ok := n.jobs[jid]
+		if !ok {
+			// job 已删除
+			if n.delIDs[jid] {
+				n.link.delGroupJob(g.ID, jid)
+				continue
+			}
+
+			if job, err = models.GetJob(jl.gname, jid); err != nil {
+				log.Warnf("get job[%s][%s] err: %s", jl.gname, jid, err.Error())
+				n.link.delGroupJob(g.ID, jid)
+				continue
+			}
+		}
+
+		cmds := job.Cmds(n.ID, n.groups)
+		for _, cmd := range cmds {
+			n.addCmd(cmd, true)
+		}
+	}
+	return
+}
+
+func (n *Node) groupRmNode(g, og *models.Group) {
 	jls := n.link[g.ID]
 	if len(jls) == 0 {
 		n.groups[g.ID] = g
@@ -298,7 +308,7 @@ func (n *Node) modGroup(g *models.Group) {
 			continue
 		}
 
-		n.groups[oGroup.ID] = oGroup
+		n.groups[og.ID] = og
 		prevCmds := job.Cmds(n.ID, n.groups)
 		n.groups[g.ID] = g
 		cmds := job.Cmds(n.ID, n.groups)
@@ -314,7 +324,6 @@ func (n *Node) modGroup(g *models.Group) {
 	}
 
 	n.groups[g.ID] = g
-	return
 }
 
 func (n *Node) watchJobs() {