From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Mon, 12 Feb 2018 19:51:17 +0000 (-0500)
Subject: 13025: Revert returning WroteStatus()==200 if no header was written.
X-Git-Tag: 1.1.4~84^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c93eb8717c79922f3e68b13405b5250bb1345d72?ds=sidebyside

13025: Revert returning WroteStatus()==200 if no header was written.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

diff --git a/sdk/go/httpserver/logger.go b/sdk/go/httpserver/logger.go
index fab850fd91..569931a3ed 100644
--- a/sdk/go/httpserver/logger.go
+++ b/sdk/go/httpserver/logger.go
@@ -54,9 +54,13 @@ func logResponse(w *responseTimer, req *http.Request, lgr *logrus.Entry) {
 			"timeWriteBody": stats.Duration(tDone.Sub(w.writeTime)),
 		})
 	}
+	respCode := w.WroteStatus()
+	if respCode == 0 {
+		respCode = http.StatusOK
+	}
 	lgr.WithFields(logrus.Fields{
-		"respStatusCode": w.WroteStatus(),
-		"respStatus":     http.StatusText(w.WroteStatus()),
+		"respStatusCode": respCode,
+		"respStatus":     http.StatusText(respCode),
 		"respBytes":      w.WroteBodyBytes(),
 	}).Info("response")
 }
diff --git a/sdk/go/httpserver/responsewriter.go b/sdk/go/httpserver/responsewriter.go
index 5fb810efa5..d37822ffe3 100644
--- a/sdk/go/httpserver/responsewriter.go
+++ b/sdk/go/httpserver/responsewriter.go
@@ -48,9 +48,6 @@ func (w *responseWriter) Write(data []byte) (n int, err error) {
 }
 
 func (w *responseWriter) WroteStatus() int {
-	if w.wroteStatus == 0 {
-		return http.StatusOK
-	}
 	return w.wroteStatus
 }