Merge pull request #116 from shunfei/develop

bugfixed

conf/files/db.json.sample

@@ -3,6 +3,11 @@
     "127.0.0.1:27017"
   ],
   "Database": "cronsun",
+  "#AuthSource": "AuthSource Specify the database name associated with the user’s credentials.",
+  "#AuthSource": "AuthSource defaults to the cronsun's Database.",
+  "#AuthSource": "If connect mongodb like './bin/mongo mytest -u "test" -p "123" --authenticationDatabase admin' ,",
+  "#AuthSource": "the AuthSource is 'admin'. ",
+  "AuthSource": "",
   "UserName": "",
   "Password": "",
   "#Timeout": "connect timeout duration/second",

db/mgo.go

@@ -1,6 +1,7 @@
 package db
 
 import (
+	"net/url"
 	"strings"
 	"time"
 
@@ -10,6 +11,9 @@ import (
 
 type Config struct {
 	Hosts []string
+	// AuthSource Specify the database name associated with the user’s credentials.
+	// authSource defaults to the database specified in the connection string.
+	AuthSource string
 	UserName   string
 	Password   string
 	Database   string
@@ -29,17 +33,22 @@ func NewMdb(c *Config) (*Mdb, error) {
 }
 
 func (m *Mdb) connect() error {
-	// url: [mongodb://][user:pass@]host1[:port1][,host2[:port2],...][/database][?options]
+	// connectionString: [mongodb://][user:pass@]host1[:port1][,host2[:port2],...][/database][?options]
-	url := strings.Join(m.Config.Hosts, ",")
+	// via: https://docs.mongodb.com/manual/reference/connection-string/
+	connectionString := strings.Join(m.Config.Hosts, ",")
 	if len(m.Config.UserName) > 0 && len(m.Config.Password) > 0 {
-		url = m.Config.UserName + ":" + m.Config.Password + "@" + url
+		connectionString = m.Config.UserName + ":" + url.QueryEscape(m.Config.Password) + "@" + connectionString
 	}
 
 	if len(m.Config.Database) > 0 {
-		url += "/" + m.Config.Database
+		connectionString += "/" + m.Config.Database
 	}
 
-	session, err := mgo.DialWithTimeout(url, m.Config.Timeout)
+	if len(m.Config.AuthSource) > 0 {
+		connectionString += "?authSource=" + m.Config.AuthSource
+	}
+
+	session, err := mgo.DialWithTimeout(connectionString, m.Config.Timeout)
 	if err != nil {
 		return err
 	}

node/node.go

@@ -304,23 +304,32 @@ func (n *Node) addGroup(g *cronsun.Group) {
 }
 
 func (n *Node) delGroup(id string) {
-	delete(n.groups, id)
+	// delete job first
-	n.link.delGroup(id)
+	defer n.link.delGroup(id)
+	defer delete(n.groups, id)
 
-	job, ok := n.jobs[id]
+	jobLinks := n.link[id]
+	if len(jobLinks) == 0 {
+		return
+	}
+
+	for jID := range jobLinks {
+		job, ok := n.jobs[jID]
 		// 之前此任务没有在当前结点执行
 		if !ok {
-		return
+			continue
 		}
 
 		cmds := job.Cmds(n.ID, n.groups)
 		if len(cmds) == 0 {
-		return
+			continue
 		}
 
 		for _, cmd := range cmds {
 			n.delCmd(cmd)
 		}
+	}
+
 	return
 }