undo CL 9658043 / ac7877558dce

The original code was correct. The count returned must be the length
of the input slice, not the length of the formatted message.

««« original CL description
log/syslog: report errors from Fprintf
Thanks to chiparus for identifying this.

Fixes #5541.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/9658043
»»»

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/9644044

diff --git a/src/pkg/log/syslog/syslog.go b/src/pkg/log/syslog/syslog.go
index 3d7ab6febd7d2e53121934b22a6c2e498865f46a..8bdd9825e1cdb045800047c12a9cc5df1d4e2d65 100644 (file)
--- a/src/pkg/log/syslog/syslog.go
+++ b/src/pkg/log/syslog/syslog.go
@@ -258,9 +258,10 @@ func (w *Writer) write(p Priority, msg string) (int, error) {
        }
 
        timestamp := time.Now().Format(time.RFC3339)
-       return fmt.Fprintf(w.conn, "<%d>%s %s %s[%d]: %s%s",
+       fmt.Fprintf(w.conn, "<%d>%s %s %s[%d]: %s%s",
                p, timestamp, w.hostname,
                w.tag, os.Getpid(), msg, nl)
+       return len(msg), nil
 }
 
 // NewLogger creates a log.Logger whose output is written to