Browse Source

change keyword from /machines to /_etcd/machines

Xiang Li 12 years ago
parent
commit
cc428c4e84
2 changed files with 2 additions and 3 deletions
  1. 1 1
      command.go
  2. 1 2
      store/keywords.go

+ 1 - 1
command.go

@@ -134,7 +134,7 @@ func (c *JoinCommand) Apply(raftServer *raft.Server) (interface{}, error) {
 
 
 	// add machine in etcd storage
 	// add machine in etcd storage
 	nodeName := fmt.Sprintf("%s%d", "node", raftServer.CommitIndex())
 	nodeName := fmt.Sprintf("%s%d", "node", raftServer.CommitIndex())
-	key := path.Join("machines", nodeName)
+	key := path.Join("_etcd/machines", nodeName)
 	value := fmt.Sprintf("%s,%d,%d", c.Hostname, c.RaftPort, c.ClientPort)
 	value := fmt.Sprintf("%s,%d,%d", c.Hostname, c.RaftPort, c.ClientPort)
 	etcdStore.Set(key, value, time.Unix(0, 0), raftServer.CommitIndex())
 	etcdStore.Set(key, value, time.Unix(0, 0), raftServer.CommitIndex())
 
 

+ 1 - 2
store/keywords.go

@@ -8,9 +8,8 @@ import (
 // keywords for internal useage
 // keywords for internal useage
 // Key for string keyword; Value for only checking prefix
 // Key for string keyword; Value for only checking prefix
 var keywords = map[string]bool{
 var keywords = map[string]bool{
-	"/acoounts":       true,
+	"/_etcd":       true,
 	"/ephemeralNodes": true,
 	"/ephemeralNodes": true,
-	"/machines":       true,
 }
 }
 
 
 // CheckKeyword will check if the key contains the keyword.
 // CheckKeyword will check if the key contains the keyword.