aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 15:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from tactilenews/fix-403

Browse Source 
fix: include $stdin in server response on error
This commit is contained in:
Bernhard B
2023-09-05 20:45:17 +02:00
committed by GitHub
parent e0e49dcbd4 7aa1fddcd8
commit 06744e9706
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/cli.go
View File

@@ -83,10 +83,9 @@ func (s *CliClient) Execute(wait bool, args []string, stdin string) (string, err
cmd.Stdin = strings.NewReader(stdin) cmd.Stdin = strings.NewReader(stdin)
} }
if wait { if wait {
var errBuffer bytes.Buffer var combinedOutput bytes.Buffer
var outBuffer bytes.Buffer cmd.Stdout = &combinedOutput
cmd.Stderr = &errBuffer cmd.Stderr = &combinedOutput
cmd.Stdout = &outBuffer
err := cmd.Start() err := cmd.Start()
if err != nil { if err != nil {
@@ -106,11 +105,11 @@ func (s *CliClient) Execute(wait bool, args []string, stdin string) (string, err
return "", errors.New("process killed as timeout reached") return "", errors.New("process killed as timeout reached")
case err := <-done: case err := <-done:
if err != nil { if err != nil {
return "", errors.New(errBuffer.String()) return "", errors.New(combinedOutput.String())
} }
} }
return outBuffer.String(), nil return combinedOutput.String(), nil
} else { } else {
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {