status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

lock.go: fix race condition 

Fix a race condition between startChild() and killChild() that could
lead to an orphaned managed process.

Fixes #1155
This commit is contained in:
Michael S. Fischer 2015-08-05 09:06:51 -07:00
parent 9a9cc9341b
commit 6875e8d6b4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/lock.go
View File

@ -268,13 +268,14 @@ func (c *LockCommand) startChild(script string, doneCh chan struct{}) error {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
// Start the child process // Start the child process
c.childLock.Lock()
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
c.Ui.Error(fmt.Sprintf("Error starting handler: %s", err)) c.Ui.Error(fmt.Sprintf("Error starting handler: %s", err))
c.childLock.Unlock()
return err return err
} }
// Setup the child info // Setup the child info
c.childLock.Lock()
c.child = cmd.Process c.child = cmd.Process
c.childLock.Unlock() c.childLock.Unlock()