Merge pull request #13 from michael-berlin/fix_log_before_flag_parse

robpike · robpike · commit fca8c8854093 · 2015-08-01T08:52:21.000+10:00
Export glog bugfix.
diff --git a/glog.go b/glog.go
@@ -676,7 +676,10 @@ func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoTo
 		}
 	}
 	data := buf.Bytes()
-	if l.toStderr {
+	if !flag.Parsed() {
+		os.Stderr.Write([]byte("ERROR: logging before flag.Parse: "))
+		os.Stderr.Write(data)
+	} else if l.toStderr {
 		os.Stderr.Write(data)
 	} else {
 		if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() {

Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,10 @@ func (l loggingT) output(s severity, buf buffer, file string, line int, alsoTo`
`676`	`676`	`}`
`677`	`677`	`}`
`678`	`678`	`data := buf.Bytes()`
`679`		`- if l.toStderr {`
	`679`	`+ if !flag.Parsed() {`
	`680`	`+ os.Stderr.Write([]byte("ERROR: logging before flag.Parse: "))`
	`681`	`+ os.Stderr.Write(data)`
	`682`	`+ } else if l.toStderr {`
`680`	`683`	`os.Stderr.Write(data)`
`681`	`684`	`} else {`
`682`	`685`	`if alsoToStderr \|\| l.alsoToStderr \|\| s >= l.stderrThreshold.get() {`