From fe438802ca3a41df98beea2880fbf9b6ebaf5bb5 Mon Sep 17 00:00:00 2001
From: Enrico <Enrico204@users.noreply.github.com>
Date: Wed, 16 Dec 2020 10:42:24 +0100
Subject: [PATCH] Fix missing format calls and minor error handling (#17)

---
 web/web.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/web/web.go b/web/web.go
index 845d049..10b0a79 100644
--- a/web/web.go
+++ b/web/web.go
@@ -86,7 +86,7 @@ func listenProxyProtocol(conf *config.Config, r *chi.Mux) {
 		addr := net.JoinHostPort(conf.BindAddress, conf.ProxyProtocolPort)
 		l, err := net.Listen("tcp", addr)
 		if err != nil {
-			log.Fatal("Cannot listen on proxy protocol port %s: %s", conf.ProxyProtocolPort, err)
+			log.Fatalf("Cannot listen on proxy protocol port %s: %s", conf.ProxyProtocolPort, err)
 		}
 
 		pl := &proxyproto.Listener{Listener: l}
@@ -108,8 +108,12 @@ func pages(w http.ResponseWriter, r *http.Request) {
 }
 
 func empty(w http.ResponseWriter, r *http.Request) {
-	io.Copy(ioutil.Discard, r.Body)
-	r.Body.Close()
+	_, err := io.Copy(ioutil.Discard, r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	_ = r.Body.Close()
 
 	w.Header().Set("Connection", "keep-alive")
 	w.WriteHeader(http.StatusOK)
@@ -129,7 +133,7 @@ func garbage(w http.ResponseWriter, r *http.Request) {
 		i, err := strconv.ParseInt(ckSize, 10, 64)
 		if err != nil {
 			log.Errorf("Invalid chunk size: %s", ckSize)
-			log.Warn("Will use default value %d", chunks)
+			log.Warnf("Will use default value %d", chunks)
 		} else {
 			// limit max chunk size to 1024
 			if i > 1024 {