Skip to content

Commit

Permalink
transmit increasing signal #95 (#97)
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Vaumoron <dvaumoron@gmail.com>
  • Loading branch information
dvaumoron authored Apr 5, 2024
1 parent 66e4fbd commit 1f8d2a9
Showing 1 changed file with 24 additions and 1 deletion.
25 changes: 24 additions & 1 deletion versionmanager/proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"math/rand"
"os"
"os/exec"
"os/signal"
"path/filepath"
"strconv"
"strings"
Expand Down Expand Up @@ -74,7 +75,17 @@ func RunCmd(installPath string, detectedVersion string, execName string) {
done(calledExitCode)
}()

if err = cmd.Run(); err != nil {
if err = cmd.Start(); err != nil {
exitWithErrorMsg(execName, err, &exitCode)

return
}

signalChan := make(chan os.Signal)
signal.Notify(signalChan, os.Interrupt)
go transmitIncreasingSignal(signalChan, cmd.Process)

if err = cmd.Wait(); err != nil {
if exitError, ok := err.(*exec.ExitError); ok {
calledExitCode = exitError.ExitCode()

Expand Down Expand Up @@ -153,6 +164,18 @@ func initIO(cmd *exec.Cmd, execName string, pExitCode *int) (func(int), error) {
}, nil
}

func transmitIncreasingSignal(signalReceiver <-chan os.Signal, process *os.Process) {
first := true
for range signalReceiver {
if first {
process.Signal(os.Interrupt)
first = false
} else {
process.Signal(os.Kill)
}
}
}

func writeMultiline(file *os.File, key string, value string) error {
delimiter := "ghadelimeter_" + strconv.Itoa(rand.Int())
if strings.Contains(key, delimiter) || strings.Contains(value, delimiter) {
Expand Down

0 comments on commit 1f8d2a9

Please sign in to comment.