Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

raft: Config -> config

Browse Source
This commit is contained in:
Blake Mizerany
2014-06-13 15:00:31 -07:00
committed by Yicheng Qin
parent fb1ca245a7
commit 78bbb37018
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
raft/node.go
View File

@@ -12,9 +12,9 @@ type Interface interface {
type tick int
type Config struct {
NodeId int
Address string
type config struct {
NodeId int
Address string
}
type Node struct {
@@ -57,9 +57,9 @@ func (n *Node) propose(t int, data []byte) {
n.Step(m)
}
func (n *Node) Add(id int) { n.updateConf(configAdd, &Config{NodeId: id}) }
func (n *Node) Add(id int) { n.updateConf(configAdd, &config{NodeId: id}) }
func (n *Node) Remove(id int) { n.updateConf(configRemove, &Config{NodeId: id}) }
func (n *Node) Remove(id int) { n.updateConf(configRemove, &config{NodeId: id}) }
func (n *Node) Msgs() []Message {
return n.sm.Msgs()
@@ -93,14 +93,14 @@ func (n *Node) Next() []Entry {
// dispatch to the application state machine
nents = append(nents, ents[i])
case configAdd:
c := new(Config)
c := new(config)
if err := json.Unmarshal(ents[i].Data, c); err != nil {
golog.Println(err)
continue
}
n.sm.Add(c.NodeId)
case configRemove:
c := new(Config)
c := new(config)
if err := json.Unmarshal(ents[i].Data, c); err != nil {
golog.Println(err)
continue
@@ -129,7 +129,7 @@ func (n *Node) Tick() {
}
}
func (n *Node) updateConf(t int, c *Config) {
func (n *Node) updateConf(t int, c *config) {
data, err := json.Marshal(c)
if err != nil {
panic(err)