update routes

Author: svarlamov

middleware/middleware.go

@@ -12,28 +12,6 @@ import (
 
 var Log = config.Cfg().GetLogger()
 
-// `Use` allows us to stack middleware to process the request
-// Example taken from https://github.com/gorilla/mux/pull/36#issuecomment-25849172
-func Use(handler http.HandlerFunc, mid ...func(http.Handler) http.HandlerFunc) http.HandlerFunc {
-	for _, m := range mid {
-		handler = m(handler)
-	}
-	return handler
-}
-
-func RecoverAndLog(handler http.Handler) http.HandlerFunc {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		defer func() {
-			r := recover()
-			if r != nil {
-				jsonhttp.JSONInternalError(w, "An internal server error occurred", "Please try again in a few seconds")
-				Log.Error("Panic occurred in HTTP handler:", r)
-			}
-		}()
-		handler.ServeHTTP(w, r)
-	})
-}
-
 func GetContext(handler http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var passItOn = func() {

routes/routes.go

@@ -0,0 +1,24 @@
+package routes
+
+import (
+	"github.com/exlinc/golang-utils/httpmiddleware"
+	"github.com/exlskills/demo-go-webservice/config"
+	"github.com/exlskills/demo-go-webservice/controllers/v1"
+	"github.com/exlskills/demo-go-webservice/middleware"
+	"github.com/gorilla/mux"
+	"net/http"
+)
+
+var Log = config.Cfg().GetLogger()
+
+func CreateRouter() http.Handler {
+	router := mux.NewRouter()
+	router.StrictSlash(true)
+
+	// V1 Routes
+	v1Router := router.PathPrefix("/v1").Subrouter()
+	v1Router.HandleFunc("/", v1.API).Methods("GET")
+	v1Router.HandleFunc("/gophers", httpmiddleware.Use(v1.GetGophers, middleware.RequireAPIKey)).Methods("GET")
+
+	return httpmiddleware.Use(router.ServeHTTP, middleware.GetContext, httpmiddleware.RecoverInternalServerError)
+}