mirror of https://github.com/status-im/consul.git
Merge pull request #1158 from mfischer-zd/fix_1155
lock.go: fix race condition
This commit is contained in:
commit
066e772536
|
@ -282,13 +282,14 @@ func (c *LockCommand) startChild(script string, doneCh chan struct{}) error {
|
|||
cmd.Stderr = os.Stderr
|
||||
|
||||
// Start the child process
|
||||
c.childLock.Lock()
|
||||
if err := cmd.Start(); err != nil {
|
||||
c.Ui.Error(fmt.Sprintf("Error starting handler: %s", err))
|
||||
c.childLock.Unlock()
|
||||
return err
|
||||
}
|
||||
|
||||
// Setup the child info
|
||||
c.childLock.Lock()
|
||||
c.child = cmd.Process
|
||||
c.childLock.Unlock()
|
||||
|
||||
|
|
Loading…
Reference in New Issue