lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-09-20 08:11:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: fix run command signal handling

Browse Source
This commit is contained in:
c9s 2020-11-23 16:36:03 +08:00
parent 1013695251
commit db6c90b8dd
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cmd/cmdutil/signal.go
View File

@ -8,7 +8,7 @@ import (
"github.com/sirupsen/logrus"
)
func WaitForSignal(ctx context.Context, signals ...os.Signal) {
func WaitForSignal(ctx context.Context, signals ...os.Signal) os.Signal {
var sigC = make(chan os.Signal, 1)
signal.Notify(sigC, signals...)
defer signal.Stop(sigC)
@ -16,9 +16,12 @@ func WaitForSignal(ctx context.Context, signals ...os.Signal) {
select {
case sig := <-sigC:
logrus.Warnf("%v", sig)
signal.Ignore()
return sig
case <-ctx.Done():
return nil
}
return nil
}

28
pkg/cmd/run.go
View File

@ -241,7 +241,23 @@ var RunCmd = &cobra.Command{
return err
}
return buildAndRun(ctx, userConfig, goOS, goArch, runArgs...)
runCmd, err := buildAndRun(ctx, userConfig, goOS, goArch, runArgs...)
if err != nil {
return err
}
if sig := cmdutil.WaitForSignal(ctx, syscall.SIGTERM, syscall.SIGINT); sig != nil {
log.Infof("sending signal to the child process...")
if err := runCmd.Process.Signal(sig); err != nil {
return err
}
if err := runCmd.Wait(); err != nil {
return err
}
}
return nil
},
}
@ -295,24 +311,24 @@ func build(ctx context.Context, buildDir string, userConfig *bbgo.Config, goOS,
return binary, nil
}
func buildAndRun(ctx context.Context, userConfig *bbgo.Config, goOS, goArch string, args ...string) error {
func buildAndRun(ctx context.Context, userConfig *bbgo.Config, goOS, goArch string, args ...string) (*exec.Cmd, error) {
buildDir := filepath.Join("build", "bbgow")
binary, err := build(ctx, buildDir, userConfig, goOS, goArch, nil)
if err != nil {
return err
return nil, err
}
cwd, err := os.Getwd()
if err != nil {
return err
return nil, err
}
executePath := filepath.Join(cwd, binary)
log.Infof("running wrapper binary, args: %v", args)
runCmd := exec.CommandContext(ctx, executePath, args...)
runCmd := exec.Command(executePath, args...)
runCmd.Stdout = os.Stdout
runCmd.Stderr = os.Stderr
return runCmd.Run()
return runCmd, runCmd.Start()
}