akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networktest: fix race condition

Browse Source
This commit is contained in:
Andrey Samokhvalov 2017-02-24 14:36:10 +03:00 committed by Olaoluwa Osuntokun
parent c30d4a9329
commit deca1926d1
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
networktest.go
View File

@ -7,7 +7,6 @@ import (
"log" "log"
"net" "net"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strconv" "strconv"
@ -30,6 +29,7 @@ import (
"github.com/roasbeef/btcd/wire" "github.com/roasbeef/btcd/wire"
"github.com/roasbeef/btcrpcclient" "github.com/roasbeef/btcrpcclient"
"github.com/roasbeef/btcutil" "github.com/roasbeef/btcutil"
"os/exec"
) )
var ( var (
@ -179,12 +179,14 @@ func (l *lightningNode) start(lndError chan error) error {
// Launch a new goroutine which that bubbles up any potential fatal // Launch a new goroutine which that bubbles up any potential fatal
// process errors to the goroutine running the tests. // process errors to the goroutine running the tests.
go func() { go func() {
if err := l.cmd.Wait(); err != nil { err := l.cmd.Wait()
lndError <- errors.New(errb.String())
}
// Signal any onlookers that this process has exited. // Signal any onlookers that this process has exited.
close(l.processExit) close(l.processExit)
if err != nil {
lndError <- errors.New(errb.String())
}
}() }()
pid, err := os.Create(filepath.Join(l.cfg.DataDir, pid, err := os.Create(filepath.Join(l.cfg.DataDir,
@ -252,16 +254,16 @@ func (l *lightningNode) stop() error {
// - start of the node wasn't initiated // - start of the node wasn't initiated
// - process wasn't spawned // - process wasn't spawned
// - process already finished // - process already finished
processFinished := l.cmd.ProcessState != nil &&
l.cmd.ProcessState.Exited()
if l.cmd == nil || l.cmd.Process == nil || processFinished {
return nil
}
if runtime.GOOS == "windows" { select {
return l.cmd.Process.Signal(os.Kill) case <-l.processExit:
return nil
default:
if runtime.GOOS == "windows" {
return l.cmd.Process.Signal(os.Kill)
}
return l.cmd.Process.Signal(os.Interrupt)
} }
return l.cmd.Process.Signal(os.Interrupt)
} }
// restart attempts to restart a lightning node by shutting it down cleanly, // restart attempts to restart a lightning node by shutting it down cleanly,