From: Rob Pike <r@golang.org>
Date: Wed, 22 May 2013 18:42:04 +0000 (-0700)
Subject: undo CL 9658043 / ac7877558dce
X-Git-Tag: go1.2rc2~1443
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f6c7b339a6b7592aa83abe253a40825fcb7d3e39;p=gostls13.git

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 3d7ab6febd..8bdd9825e1 100644
--- 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