Skip to content

Fix RunCommandNB pipe issue #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 25, 2018
Merged

Fix RunCommandNB pipe issue #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b2a9f0
Fix RunCommandNB pipe issue
Dec 25, 2018
0f53693
Merge branch 'develop' into bugfix/execPipe
auxten Dec 25, 2018
e05d2fc
Put LogFD in CMD struct for RunCommandNB defer close
Dec 25, 2018
57d28da
Merge branch 'bugfix/execPipe' of github.com:CovenantSQL/CovenantSQL …
Dec 25, 2018
c9c94e9
Fix typo
Dec 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions rpc/leak_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,22 @@ import (

func TestSessionPool_SessionBroken(t *testing.T) {
log.SetLevel(log.DebugLevel)
utils.Build()
var err error
err = utils.Build()
if err != nil {
t.Errorf("build failed: %v", err)
}
conf.GConf, err = conf.LoadConfig(FJ(testWorkingDir, "./leak/client.yaml"))
if err != nil {
t.Errorf("load config from %s failed: %s", FJ(testWorkingDir, "./leak/client.yaml"), err)
}
log.Debugf("GConf: %##v", conf.GConf)
os.Remove(conf.GConf.PubKeyStoreFile)
os.Remove(FJ(testWorkingDir, "./leak/leader/dht.db"))
os.Remove(FJ(testWorkingDir, "./leak/leader/dht.db-shm"))
os.Remove(FJ(testWorkingDir, "./leak/leader/dht.db-wal"))
os.Remove(FJ(testWorkingDir, "./leak/kayak.db"))
os.RemoveAll(FJ(testWorkingDir, "./leak/kayak.ldb"))
_ = os.Remove(conf.GConf.PubKeyStoreFile)
_ = os.Remove(FJ(testWorkingDir, "./leak/leader/dht.db"))
_ = os.Remove(FJ(testWorkingDir, "./leak/leader/dht.db-shm"))
_ = os.Remove(FJ(testWorkingDir, "./leak/leader/dht.db-wal"))
_ = os.Remove(FJ(testWorkingDir, "./leak/kayak.db"))
_ = os.RemoveAll(FJ(testWorkingDir, "./leak/kayak.ldb"))

leader, err := utils.RunCommandNB(
FJ(baseDir, "./bin/cqld"),
Expand All @@ -53,7 +56,8 @@ func TestSessionPool_SessionBroken(t *testing.T) {
)

defer func() {
leader.Cmd.Process.Signal(syscall.SIGKILL)
_ = leader.LogFD.Close()
_ = leader.Cmd.Process.Signal(syscall.SIGKILL)
}()

log.Debugf("leader pid %d", leader.Cmd.Process.Pid)
Expand Down
44 changes: 16 additions & 28 deletions utils/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var FJ = filepath.Join
type CMD struct {
Cmd *exec.Cmd
LogPath string
LogFD *os.File
}

// GetProjectSrcDir gets the src code root
Expand Down Expand Up @@ -70,6 +71,9 @@ func RunCommand(bin string, args []string, processName string, workingDir string
}).WithError(err).Error("start command failed")
return
}
defer func() {
_ = cmd.LogFD.Close()
}()
err = cmd.Cmd.Wait()
if err != nil {
log.WithFields(log.Fields{
Expand All @@ -84,52 +88,36 @@ func RunCommand(bin string, args []string, processName string, workingDir string
// RunCommandNB starts a non-blocking command
func RunCommandNB(bin string, args []string, processName string, workingDir string, logDir string, toStd bool) (cmd *CMD, err error) {
cmd = new(CMD)
cmd.LogPath = FJ(logDir, processName+".log")
logFD, err := os.Create(cmd.LogPath)
err = os.Chdir(workingDir)
if err != nil {
log.WithField("path", cmd.LogPath).WithError(err).Error("create log file failed")
log.WithField("wd", workingDir).Error("change working dir failed")
return
}

err = os.Chdir(workingDir)
cmd.LogPath = FJ(logDir, processName+".log")
cmd.LogFD, err = os.Create(cmd.LogPath)
if err != nil {
log.WithField("wd", workingDir).Error("change working dir failed")
log.WithField("path", cmd.LogPath).WithError(err).Error("create log file failed")
return
}

cmd.Cmd = exec.Command(bin, args...)
stdoutIn, _ := cmd.Cmd.StdoutPipe()
stderrIn, _ := cmd.Cmd.StderrPipe()

var stdout, stderr io.Writer
if toStd {
stdout = io.MultiWriter(os.Stdout, logFD)
stderr = io.MultiWriter(os.Stderr, logFD)
cmd.Cmd.Stdout = io.MultiWriter(os.Stdout, cmd.LogFD)
cmd.Cmd.Stderr = io.MultiWriter(os.Stderr, cmd.LogFD)
} else {
stdout = logFD
stderr = logFD
cmd.Cmd.Stdout = cmd.LogFD
cmd.Cmd.Stderr = cmd.LogFD
}

err = cmd.Cmd.Start()
if err != nil {
log.WithError(err).Error("cmd.Start() failed")
_ = cmd.LogFD.Close()
cmd = nil
return
}

go func() {
_, err := io.Copy(stdout, stdoutIn)
if err != nil {
log.WithError(err).Error("failed to capture stdout")
return
}
}()

go func() {
_, err := io.Copy(stderr, stderrIn)
if err != nil {
log.WithError(err).Error("failed to capture stderr")
return
}
}()

return
}