github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1158 from mfischer-zd/fix_1155 

lock.go: fix race condition
pull/1160/head
Armon Dadgar 2015-08-05 14:56:13 -07:00
parent 3846dea370 6875e8d6b4
commit 066e772536
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/lock.go
View File

@ -282,13 +282,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()