dave/vpngate
1
0
Fork 0
mirror of https://github.com/davegallant/vpngate.git synced 2025-08-07 09:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure clean exit of exec.Command

Browse Source
This commit is contained in:
Dave Gallant
2021-01-03 16:04:51 -05:00
parent ce7cd9f9a1
commit 3ea6d32c65
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
dist/

8
pkg/exec/run.go
View File

@@ -5,12 +5,15 @@ import (
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
"syscall"
"github.com/juju/errors" "github.com/juju/errors"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
// Run executes anycommand in workDir and returns stdout and error. // Run executes a command in workDir and returns stdout and error.
// The spawned process will exit upon termination of this application
// to ensure a clean exit
func Run(path string, workDir string, args ...string) (string, error) { func Run(path string, workDir string, args ...string) (string, error) {
_, err := exec.LookPath(path) _, err := exec.LookPath(path)
if err != nil { if err != nil {
@@ -23,6 +26,9 @@ func Run(path string, workDir string, args ...string) (string, error) {
stderr := &bytes.Buffer{} stderr := &bytes.Buffer{}
cmd.Stdout = stdout cmd.Stdout = stdout
cmd.Stderr = stderr cmd.Stderr = stderr
cmd.SysProcAttr = &syscall.SysProcAttr{
Pdeathsig: syscall.SIGTERM,
}
log.Debug().Msgf("Executing " + strings.Join(cmd.Args, " ")) log.Debug().Msgf("Executing " + strings.Join(cmd.Args, " "))
err = cmd.Run() err = cmd.Run()
output := strings.TrimSpace(stdout.String()) output := strings.TrimSpace(stdout.String())