cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

cmd/utils: don't check for stderr redirect on windows

Browse Source 
The redirect check did not work on Go 1.6 and below because Stat
returned an error for stdout and stderr. In Go 1.7 Stat works on stdout
but doesn't return anything meaningful, causing cmd/geth test failures
because the message is printed to stderr only. Fix it by printing to
stdout only.
This commit is contained in:
Felix Lange 2016-09-26 17:23:26 +02:00
parent 61734cc7ae
commit b04219fdbb
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/utils/cmd.go
View File

@ -23,6 +23,7 @@ import (
"os" "os"
"os/signal" "os/signal"
"regexp" "regexp"
"runtime"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
@ -52,11 +53,17 @@ func openLogFile(Datadir string, filename string) *os.File {
// is redirected to a different file. // is redirected to a different file.
func Fatalf(format string, args ...interface{}) { func Fatalf(format string, args ...interface{}) {
w := io.MultiWriter(os.Stdout, os.Stderr) w := io.MultiWriter(os.Stdout, os.Stderr)
if runtime.GOOS == "windows" {
// The SameFile check below doesn't work on Windows.
// stdout is unlikely to get redirected though, so just print there.
w = os.Stdout
} else {
outf, _ := os.Stdout.Stat() outf, _ := os.Stdout.Stat()
errf, _ := os.Stderr.Stat() errf, _ := os.Stderr.Stat()
if outf != nil && errf != nil && os.SameFile(outf, errf) { if outf != nil && errf != nil && os.SameFile(outf, errf) {
w = os.Stderr w = os.Stderr
} }
}
fmt.Fprintf(w, "Fatal: "+format+"\n", args...) fmt.Fprintf(w, "Fatal: "+format+"\n", args...)
logger.Flush() logger.Flush()
os.Exit(1) os.Exit(1)