Improve error handling.

adyatlov · Jun 1, 2016 · bc99e61 · bc99e61
1 parent 200624c
commit bc99e61
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/s3proxy.go b/s3proxy.go
@@ -80,6 +80,7 @@ func serve(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
+	defer s3resp.Body.Close()
 
 	if s3resp.ContentDisposition != nil {
 		w.Header().Add("Content-Disposition", *s3resp.ContentDisposition)
@@ -101,7 +102,10 @@ func serve(w http.ResponseWriter, r *http.Request) {
 	}
 
 	nBytes, err := io.Copy(w, s3resp.Body)
-	s3resp.Body.Close()
+	if err != nil {
+		log.Println("Error occured during copying:", err)
+		return
+	}
 	log.Printf("%v: %v bytes are copied.\n", r.URL.EscapedPath(), nBytes)
 }