luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Make the defer statement of waitgroup to execute last

Browse source
This commit is contained in:
vishalnayak 2016-08-01 10:24:27 -04:00
parent ea2e677f02
commit 5ed10f4074
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
command/server.go
View file

@ -437,6 +437,7 @@ func (c *ServerCommand) Run(args []string) int {
} }
} }
// Wait for dependant goroutines to complete
c.WaitGroup.Wait() c.WaitGroup.Wait()
return 0 return 0
} }

5
physical/consul.go
View file

@ -421,6 +421,7 @@ func (c *ConsulBackend) RunServiceDiscovery(shutdownTriggered *bool, waitGroup *
return err return err
} }
// 'server' command will wait for the belog goroutine to complete
waitGroup.Add(1) waitGroup.Add(1)
go c.runEventDemuxer(shutdownTriggered, waitGroup, shutdownCh, advertiseAddr, activeFunc, sealedFunc) go c.runEventDemuxer(shutdownTriggered, waitGroup, shutdownCh, advertiseAddr, activeFunc, sealedFunc)
@ -429,6 +430,9 @@ func (c *ConsulBackend) RunServiceDiscovery(shutdownTriggered *bool, waitGroup *
} }
func (c *ConsulBackend) runEventDemuxer(shutdownTriggered *bool, waitGroup *sync.WaitGroup, shutdownCh ShutdownChannel, advertiseAddr string, activeFunc activeFunction, sealedFunc sealedFunction) { func (c *ConsulBackend) runEventDemuxer(shutdownTriggered *bool, waitGroup *sync.WaitGroup, shutdownCh ShutdownChannel, advertiseAddr string, activeFunc activeFunction, sealedFunc sealedFunction) {
// This defer statement should be executed last. So push it first.
defer waitGroup.Done()
// Fire the reconcileTimer immediately upon starting the event demuxer // Fire the reconcileTimer immediately upon starting the event demuxer
reconcileTimer := time.NewTimer(0) reconcileTimer := time.NewTimer(0)
defer reconcileTimer.Stop() defer reconcileTimer.Stop()
@ -519,7 +523,6 @@ shutdown:
if err := c.client.Agent().ServiceDeregister(registeredServiceID); err != nil { if err := c.client.Agent().ServiceDeregister(registeredServiceID); err != nil {
c.logger.Printf("[WARN]: physical/consul: service deregistration failed: %v", err) c.logger.Printf("[WARN]: physical/consul: service deregistration failed: %v", err)
} }
defer waitGroup.Done()
} }
// checkID returns the ID used for a Consul Check. Assume at least a read // checkID returns the ID used for a Consul Check. Assume at least a read