Merge branch 'mtojek-fix_missing_net_listener'

engine/engine.go

@@ -5,6 +5,8 @@ import (
 	"mime/multipart"
 	"time"
 
+	"net"
+
 	"github.com/labstack/gommon/log"
 )
 
@@ -137,6 +139,7 @@ type (
 	// Config defines engine configuration.
 	Config struct {
 		Address      string        // TCP address to listen on.
+		Listener     net.Listener  // Custom `net.Listener`. If set, server accepts connections on it.
 		TLSCertfile  string        // TLS certificate file path.
 		TLSKeyfile   string        // TLS key file path.
 		ReadTimeout  time.Duration // Maximum duration before timing out read of the request.

engine/fasthttp/server.go

@@ -123,10 +123,27 @@ func (s *Server) Start() {
 	addr := s.config.Address
 	certfile := s.config.TLSCertfile
 	keyfile := s.config.TLSKeyfile
-	if certfile != "" && keyfile != "" {
+
-		s.logger.Fatal(fasthttp.ListenAndServeTLS(addr, certfile, keyfile, handler))
+	if s.config.Listener == nil {
+		s.startDefaultListener(addr, certfile, keyfile, handler)
 	} else {
-		s.logger.Fatal(fasthttp.ListenAndServe(addr, handler))
+		s.startCustomListener(certfile, keyfile, handler)
+	}
+}
+
+func (s *Server) startDefaultListener(addr, certfile, keyfile string, h fasthttp.RequestHandler) {
+	if certfile != "" && keyfile != "" {
+		s.logger.Fatal(fasthttp.ListenAndServeTLS(addr, certfile, keyfile, h))
+	} else {
+		s.logger.Fatal(fasthttp.ListenAndServe(addr, h))
+	}
+}
+
+func (s *Server) startCustomListener(certfile, keyfile string, h fasthttp.RequestHandler) {
+	if certfile != "" && keyfile != "" {
+		s.logger.Fatal(fasthttp.ServeTLS(s.config.Listener, certfile, keyfile, h))
+	} else {
+		s.logger.Fatal(fasthttp.Serve(s.config.Listener, h))
 	}
 }
 

engine/standard/server.go

@@ -94,6 +94,15 @@ func (s *Server) SetLogger(l *log.Logger) {
 func (s *Server) Start() {
 	certfile := s.config.TLSCertfile
 	keyfile := s.config.TLSKeyfile
+
+	if s.config.Listener == nil {
+		s.startDefaultListener(certfile, keyfile)
+	} else {
+		s.startCustomListener()
+	}
+}
+
+func (s *Server) startDefaultListener(certfile, keyfile string) {
 	if certfile != "" && keyfile != "" {
 		s.logger.Fatal(s.ListenAndServeTLS(certfile, keyfile))
 	} else {
@@ -101,6 +110,10 @@ func (s *Server) Start() {
 	}
 }
 
+func (s *Server) startCustomListener() {
+	s.logger.Fatal(s.Serve(s.config.Listener))
+}
+
 // ServeHTTP implements `http.Handler` interface.
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Request

router_test.go

@@ -575,6 +575,7 @@ func TestRouterAPI(t *testing.T) {
 func BenchmarkRouterGitHubAPI(b *testing.B) {
 	e := New()
 	r := e.router
+	b.ReportAllocs()
 
 	// Add routes
 	for _, route := range api {
@@ -584,10 +585,14 @@ func BenchmarkRouterGitHubAPI(b *testing.B) {
 	}
 
 	// Find routes
-	c := e.pool.Get().(*context)
 	for i := 0; i < b.N; i++ {
 		for _, route := range api {
+			// c := e.pool.Get().(*context)
+			c := e.GetContext()
 			r.Find(route.Method, route.Path, c)
+			// router.Find(r.Method, r.Path, c)
+			e.PutContext(c)
+			// e.pool.Put(c)
 		}
 	}
 }