fix: keep in-code order of routes

Author: saitho

webserver/request_handler.go

@@ -32,11 +32,8 @@ func NewRequestHandler() *RequestHandler {
 	return app
 }
 
-func (a *RequestHandler) Handle(pattern string, handler Handler) {
-	re := regexp.MustCompile(pattern)
-	route := Route{Pattern: re, Handler: handler}
-
-	a.Routes = append(a.Routes, route)
+func (a *RequestHandler) Handle(route *Route) {
+	a.Routes = append(a.Routes, *route)
 }
 
 func (a *RequestHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

webserver/webserver.go

@@ -2,6 +2,7 @@ package webserver
 
 import (
 	"net/http"
+	"regexp"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -10,20 +11,20 @@ type Webserver struct {
 	Port       string
 	ConfigPath string
 
-	handlers map[string]Handler
+	routes []*Route
 }
 
 func (w *Webserver) AddHandler(pattern string, handler Handler) {
-	if w.handlers == nil {
-		w.handlers = map[string]Handler{}
-	}
-	w.handlers[pattern] = handler
+	w.routes = append(w.routes, &Route{
+		Pattern: regexp.MustCompile(pattern),
+		Handler: handler,
+	})
 }
 
 func (w *Webserver) Run() {
 	app := NewRequestHandler()
-	for pattern, handler := range w.handlers {
-		app.Handle(pattern, handler)
+	for _, route := range w.routes {
+		app.Handle(route)
 	}
 
 	log.Infof("Serving with config at %s on HTTP port: %s\n", w.ConfigPath, w.Port)