Squash up the code via 'defer'

weaveworks · Jun 17, 2016 · 6b16014 · 6b16014
1 parent f60c97d
commit 6b16014
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/proxy/proxy_intercept.go b/proxy/proxy_intercept.go
@@ -77,24 +77,22 @@ func doRawStream(w http.ResponseWriter, resp *http.Response, client *httputil.Cl
 	}
 	defer down.Close()
 	defer up.Close()
+	defer func() {
+		if err != nil {
+			Log.Warning(err)
+		}
+	}()
 
-	if _, err := downBuf.Write([]byte("HTTP/1.1 " + resp.Status + "\n")); err != nil {
-		Log.Warning(err)
+	if _, err = downBuf.Write([]byte("HTTP/1.1 " + resp.Status + "\n")); err != nil {
 		return
 	}
-
-	if err := resp.Header.Write(downBuf); err != nil {
-		Log.Warning(err)
+	if err = resp.Header.Write(downBuf); err != nil {
 		return
 	}
-
-	if _, err := downBuf.Write([]byte("\n")); err != nil {
-		Log.Warning(err)
+	if _, err = downBuf.Write([]byte("\n")); err != nil {
 		return
 	}
-
 	if err = downBuf.Flush(); err != nil {
-		Log.Warning(err)
 		return
 	}