Use proper middleware

logger.go

@@ -7,17 +7,21 @@ import (
 )
 
 // Logger logs HTTP requests
-func Logger(inner http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		start := time.Now()
+func Logger() Middleware {
+	return func(next http.HandlerFunc) http.HandlerFunc {
+		return func(w http.ResponseWriter, r *http.Request) {
+			start := time.Now()
 
-		inner.ServeHTTP(w, r)
+			defer func() {
+				log.Printf(
+					"%s\t%s\t%s",
+					r.Method,
+					r.RequestURI,
+					time.Since(start),
+				)
+			}()
 
-		log.Printf(
-			"%s\t%s\t%s",
-			r.Method,
-			r.RequestURI,
-			time.Since(start),
-		)
-	})
+			next(w, r)
+		}
+	}
 }

middleware.go

@@ -0,0 +1,14 @@
+package main
+
+import "net/http"
+
+// Middleware is an HTTP middleware
+type Middleware func(http.HandlerFunc) http.HandlerFunc
+
+// Chain applies middleware to an HTTP handler function
+func Chain(f http.HandlerFunc, middlewares ...Middleware) http.HandlerFunc {
+	for i := len(middlewares) - 1; i >= 0; i-- {
+		f = middlewares[i](f)
+	}
+	return f
+}

router.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"net/http"
-
 	"github.com/gorilla/mux"
 )
 
@@ -11,15 +9,10 @@ func NewRouter() *mux.Router {
 	router := mux.NewRouter().StrictSlash(true)
 
 	for _, route := range routes {
-		var handler http.Handler
-
-		handler = route.HandlerFunc
-		handler = Logger(handler)
-
 		router.
 			Methods(route.Method).
 			Path(route.Pattern).
-			Handler(handler)
+			HandlerFunc(route.HandlerFunc)
 	}
 
 	return router

routes.go

@@ -16,41 +16,41 @@ var routes = Routes{
 	Route{
 		"GET",
 		"/",
-		indexPageHandler,
+		Chain(indexPageHandler, Logger()),
 	},
 	Route{
 		"GET",
 		"/buckets",
-		bucketsPageHandler,
+		Chain(bucketsPageHandler, Logger()),
 	},
 	Route{
 		"GET",
 		"/buckets/{bucketName}",
-		bucketPageHandler,
+		Chain(bucketPageHandler, Logger()),
 	},
 	Route{
 		"POST",
 		"/api/buckets",
-		createBucketHandler,
+		Chain(createBucketHandler, Logger()),
 	},
 	Route{
 		"DELETE",
 		"/api/buckets/{bucketName}",
-		deleteBucketHandler,
+		Chain(deleteBucketHandler, Logger()),
 	},
 	Route{
 		"GET",
 		"/api/buckets/{bucketName}/objects/{objectName}",
-		getObjectHandler,
+		Chain(getObjectHandler, Logger()),
 	},
 	Route{
 		"POST",
 		"/api/buckets/{bucketName}/objects",
-		createObjectHandler,
+		Chain(createObjectHandler, Logger()),
 	},
 	Route{
 		"DELETE",
 		"/api/buckets/{bucketName}/objects/{objectName}",
-		deleteObjectHandler,
+		Chain(deleteObjectHandler, Logger()),
 	},
 }