lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcd: Rename loop to be more consistent in messages

Browse Source 
Small nitpick fixups
This commit is contained in:
James Shubin
2016-08-30 01:12:56 -04:00
parent 8d3011fb9c
commit 6bf32c978a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
etcd.go
View File

@@ -332,8 +332,8 @@ func (obj *EmbdEtcd) Startup() error {
} }
}() }()
go obj.CallbackLoop() // start callback loop go obj.CbLoop() // start callback loop
go obj.Loop() // start main loop go obj.Loop() // start main loop
// TODO: implement native etcd watcher method on member API changes // TODO: implement native etcd watcher method on member API changes
path := fmt.Sprintf("/%s/nominated/", NS) path := fmt.Sprintf("/%s/nominated/", NS)
@@ -675,8 +675,8 @@ func (obj *EmbdEtcd) CtxError(ctx context.Context, err error) (context.Context,
return ctx, obj.ctxErr return ctx, obj.ctxErr
} }
// CallbackLoop is the loop where callback execution is serialized // CbLoop is the loop where callback execution is serialized
func (obj *EmbdEtcd) CallbackLoop() { func (obj *EmbdEtcd) CbLoop() {
cuuid := obj.converger.Register() cuuid := obj.converger.Register()
defer cuuid.Unregister() defer cuuid.Unregister()
if e := obj.Connect(false); e != nil { if e := obj.Connect(false); e != nil {
@@ -689,7 +689,7 @@ func (obj *EmbdEtcd) CallbackLoop() {
case re := <-obj.wevents: case re := <-obj.wevents:
cuuid.SetConverged(false) // activity! cuuid.SetConverged(false) // activity!
if TRACE { if TRACE {
log.Printf("Trace: Etcd: Loop: Event: StartLoop") log.Printf("Trace: Etcd: CbLoop: Event: StartLoop")
} }
for { for {
if obj.exiting { // the exit signal has been sent! if obj.exiting { // the exit signal has been sent!
@@ -697,11 +697,11 @@ func (obj *EmbdEtcd) CallbackLoop() {
break break
} }
if TRACE { if TRACE {
log.Printf("Trace: Etcd: Loop: rawCallback()") log.Printf("Trace: Etcd: CbLoop: rawCallback()")
} }
err := rawCallback(ctx, re) err := rawCallback(ctx, re)
if TRACE { if TRACE {
log.Printf("Trace: Etcd: Loop: rawCallback(): %v", err) log.Printf("Trace: Etcd: CbLoop: rawCallback(): %v", err)
} }
if err == nil { if err == nil {
//re.resp.ACK() // success //re.resp.ACK() // success
@@ -713,7 +713,7 @@ func (obj *EmbdEtcd) CallbackLoop() {
} }
} }
if TRACE { if TRACE {
log.Printf("Trace: Etcd: Loop: Event: FinishLoop") log.Printf("Trace: Etcd: CbLoop: Event: FinishLoop")
} }
// converged timeout // converged timeout