log: roll back deprecation of old API to apply fix to log.Output in public release.

R=adg
CC=golang-dev
https://golang.org/cl/2525042

diff --git a/src/pkg/log/log.go b/src/pkg/log/log.go
index 50c01a3d350bfafe2c9f3cbba46e476345c6f93f..7ef87a3ebce7d2687c907803890d875bcaeaa8f1 100644 (file)
--- a/src/pkg/log/log.go
+++ b/src/pkg/log/log.go
@@ -49,7 +49,10 @@ func New(out io.Writer, prefix string, flag int) *Logger {
        return &Logger{out, prefix, flag}
 }
 
-var std = New(os.Stderr, "", Ldate|Ltime)
+var (
+       std    = New(os.Stderr, "", Ldate|Ltime)
+       stdout = New(os.Stdout, "", Ldate|Ltime) // Deprecated.
+)
 
 // Cheap integer to fixed-width decimal ASCII.  Give a negative width to avoid zero-padding.
 // Knows the buffer has capacity.
@@ -221,3 +224,39 @@ func Panicln(v ...interface{}) {
        std.Output(2, s)
        panic(s)
 }
+
+// Everything from here on is deprecated and will be removed after the next release.
+
+// Logf is analogous to Printf() for a Logger.
+// Deprecated.
+func (l *Logger) Logf(format string, v ...interface{}) {
+       l.Output(2, fmt.Sprintf(format, v...))
+}
+
+// Log is analogous to Print() for a Logger.
+// Deprecated.
+func (l *Logger) Log(v ...interface{}) { l.Output(2, fmt.Sprintln(v...)) }
+
+// Stdout is a helper function for easy logging to stdout. It is analogous to Print().
+// Deprecated.
+func Stdout(v ...interface{}) { stdout.Output(2, fmt.Sprint(v...)) }
+
+// Stderr is a helper function for easy logging to stderr. It is analogous to Fprint(os.Stderr).
+// Deprecated.
+func Stderr(v ...interface{}) { std.Output(2, fmt.Sprintln(v...)) }
+
+// Stdoutf is a helper functions for easy formatted logging to stdout. It is analogous to Printf().
+// Deprecated.
+func Stdoutf(format string, v ...interface{}) { stdout.Output(2, fmt.Sprintf(format, v...)) }
+
+// Stderrf is a helper function for easy formatted logging to stderr. It is analogous to Fprintf(os.Stderr).
+// Deprecated.
+func Stderrf(format string, v ...interface{}) { std.Output(2, fmt.Sprintf(format, v...)) }
+
+// Crash is equivalent to Stderr() followed by a call to panic().
+// Deprecated.
+func Crash(v ...interface{}) { Panicln(v...) }
+
+// Crashf is equivalent to Stderrf() followed by a call to panic().
+// Deprecated.
+func Crashf(format string, v ...interface{}) { Panicf(format, v...) }