From e17a6d4b9d613918004991ee74ea95a29fc291e7 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Wed, 22 May 2013 12:45:52 -0700 Subject: [PATCH] log/syslog: report errors from write Fixes #5541. This time for sure. R=golang-dev, minux.ma, iant CC=golang-dev https://golang.org/cl/9668043 --- src/pkg/log/syslog/syslog.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pkg/log/syslog/syslog.go b/src/pkg/log/syslog/syslog.go index 8bdd9825e1..e04a2eb553 100644 --- a/src/pkg/log/syslog/syslog.go +++ b/src/pkg/log/syslog/syslog.go @@ -258,9 +258,15 @@ func (w *Writer) write(p Priority, msg string) (int, error) { } timestamp := time.Now().Format(time.RFC3339) - fmt.Fprintf(w.conn, "<%d>%s %s %s[%d]: %s%s", + _, err := fmt.Fprintf(w.conn, "<%d>%s %s %s[%d]: %s%s", p, timestamp, w.hostname, w.tag, os.Getpid(), msg, nl) + if err != nil { + return 0, err + } + // Note: return the length of the input, not the number of + // bytes printed by Fprintf, because this must behave like + // an io.Writer. return len(msg), nil } -- 2.48.1