Skip to content

Commit ef31da2

Browse files
committed
fix: use cmd.Wait ExitCode
1 parent f972d38 commit ef31da2

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

cmd/compiledb/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/urfave/cli/v2"
1111
)
1212

13-
var Version string = "v1.3.5"
13+
var Version string = "v1.3.6"
1414

1515
func init() {
1616
log.SetOutput(os.Stdout)

internal/init.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bufio"
55
"bytes"
66
"encoding/json"
7+
"fmt"
78
"os"
89
"os/exec"
910
"strings"
@@ -96,30 +97,30 @@ func MakeWrap(args []string) {
9697
// cmd.Stderr = os.Stderr
9798
stdout, err := cmd.StdoutPipe()
9899
if err != nil {
99-
log.Error("Error:", err)
100-
return
100+
fmt.Println("stdout Error:", err)
101+
goto out
101102
}
102103
stderr, err := cmd.StderrPipe()
103104
if err != nil {
104-
log.Error("Error:", err)
105-
return
105+
fmt.Println("stderr Error:", err)
106+
goto out
106107
}
107108

108109
if err := cmd.Start(); err != nil {
109-
if exitError, ok := err.(*exec.ExitError); ok {
110-
StatusCode = exitError.ExitCode()
111-
log.Errorf("make failed! errorCode: %d", StatusCode)
112-
}
110+
fmt.Println("start Error:", err)
111+
goto out
113112
}
114113

115114
go TransferPrintScanner(stdout)
116115
go TransferPrintScanner(stderr)
117116

118117
if err := cmd.Wait(); err != nil {
119-
log.Error("Error:", err)
118+
StatusCode = cmd.ProcessState.ExitCode()
119+
fmt.Printf("make failed! errorCode: %d\n", StatusCode)
120120
}
121121
}
122122

123+
out:
123124
wg.Wait()
124125
}
125126

internal/util.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"os/exec"
99
"strings"
1010

11-
log "github.com/sirupsen/logrus"
1211
"golang.org/x/text/encoding/simplifiedchinese"
1312
)
1413

@@ -56,13 +55,13 @@ func TransferPrintScanner(in io.ReadCloser) {
5655
for scanner.Scan() {
5756
result, err := decoder.String(scanner.Text())
5857
if err != nil {
59-
log.Error("decode failed!", scanner.Text())
58+
fmt.Println("decode failed!", scanner.Text())
6059
result = ""
6160
}
6261
fmt.Println(result)
6362
}
6463

6564
if err := scanner.Err(); err != nil {
66-
log.Error("Error reading scanner:", err)
65+
fmt.Println("Error reading scanner:", err)
6766
}
6867
}

0 commit comments

Comments
 (0)