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 fab850fd91173f17eb7c6b1b76bc2fb32749d6d9..569931a3edd732b4fb3d48a09db318622bd08075 100644 (file)
--- 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 5fb810efa5a80bae22fed5449f6b86186c9aef63..d37822ffe3e5cd0f582a59a3ee45b1d322fed4ac 100644 (file)
--- 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
 }