go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-03-29 21:56:53 +02:00
Code Issues Releases Activity

Fixed #419, Fixed #420.

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-03-18 12:13:37 -07:00
parent da010b035d
commit 40728e26e6
3 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/engine.go
View File

@ -20,7 +20,7 @@ type (
SetLogger(*log.Logger)
// Start starts the HTTP server.
Start()
Start() error
}
// Request defines the interface for HTTP request.

85
engine/fasthttp/server.go
View File

@ -14,6 +14,7 @@ import (
type (
// Server implements `engine.Server`.
Server struct {
*fasthttp.Server
config engine.Config
handler engine.Handler
logger *log.Logger
@ -48,6 +49,7 @@ func NewFromTLS(addr, certfile, keyfile string) *Server {
// NewFromConfig returns an instance of `standard.Server` from config.
func NewFromConfig(c engine.Config) (s *Server) {
s = &Server{
Server: new(fasthttp.Server),
config: c,
pool: &pool{
request: sync.Pool{
@ -77,10 +79,11 @@ func NewFromConfig(c engine.Config) (s *Server) {
},
},
handler: engine.HandlerFunc(func(req engine.Request, res engine.Response) {
s.logger.Fatal("handler not set")
s.logger.Error("handler not set, use `SetHandler()` to set it.")
}),
logger: log.New("echo"),
}
s.Handler = s.ServeHTTP
return
}
@ -95,56 +98,52 @@ func (s *Server) SetLogger(l *log.Logger) {
}
// Start implements `engine.Server#Start` method.
func (s *Server) Start() {
handler := func(c *fasthttp.RequestCtx) {
// Request
req := s.pool.request.Get().(*Request)
reqHdr := s.pool.requestHeader.Get().(*RequestHeader)
reqURL := s.pool.url.Get().(*URL)
reqHdr.reset(&c.Request.Header)
reqURL.reset(c.URI())
req.reset(c, reqHdr, reqURL)
// Response
res := s.pool.response.Get().(*Response)
resHdr := s.pool.responseHeader.Get().(*ResponseHeader)
resHdr.reset(&c.Response.Header)
res.reset(c, resHdr)
s.handler.ServeHTTP(req, res)
s.pool.request.Put(req)
s.pool.requestHeader.Put(reqHdr)
s.pool.url.Put(reqURL)
s.pool.response.Put(res)
s.pool.responseHeader.Put(resHdr)
}
addr := s.config.Address
certfile := s.config.TLSCertfile
keyfile := s.config.TLSKeyfile
func (s *Server) Start() error {
if s.config.Listener == nil {
s.startDefaultListener(addr, certfile, keyfile, handler)
} else {
s.startCustomListener(certfile, keyfile, handler)
return s.startDefaultListener()
}
return s.startCustomListener()
}
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) startDefaultListener() error {
c := s.config
if c.TLSCertfile != "" && c.TLSKeyfile != "" {
return s.ListenAndServeTLS(c.Address, c.TLSCertfile, c.TLSKeyfile)
}
return s.ListenAndServe(c.Address)
}
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))
func (s *Server) startCustomListener() error {
c := s.config
if c.TLSCertfile != "" && c.TLSKeyfile != "" {
return s.ServeTLS(c.Listener, c.TLSCertfile, c.TLSKeyfile)
}
return s.Serve(c.Listener)
}
func (s *Server) ServeHTTP(c *fasthttp.RequestCtx) {
// Request
req := s.pool.request.Get().(*Request)
reqHdr := s.pool.requestHeader.Get().(*RequestHeader)
reqURL := s.pool.url.Get().(*URL)
reqHdr.reset(&c.Request.Header)
reqURL.reset(c.URI())
req.reset(c, reqHdr, reqURL)
// Response
res := s.pool.response.Get().(*Response)
resHdr := s.pool.responseHeader.Get().(*ResponseHeader)
resHdr.reset(&c.Response.Header)
res.reset(c, resHdr)
s.handler.ServeHTTP(req, res)
s.pool.request.Put(req)
s.pool.requestHeader.Put(reqHdr)
s.pool.url.Put(reqURL)
s.pool.response.Put(res)
s.pool.responseHeader.Put(resHdr)
}
// WrapHandler wraps `fasthttp.RequestHandler` into `echo.HandlerFunc`.

26
engine/standard/server.go
View File

@ -71,7 +71,7 @@ func NewFromConfig(c engine.Config) (s *Server) {
},
},
handler: engine.HandlerFunc(func(req engine.Request, res engine.Response) {
s.logger.Fatal("handler not set")
s.logger.Error("handler not set, use `SetHandler()` to set it.")
}),
logger: log.New("echo"),
}
@ -91,27 +91,23 @@ func (s *Server) SetLogger(l *log.Logger) {
}
// Start implements `engine.Server#Start` method.
func (s *Server) Start() {
certfile := s.config.TLSCertfile
keyfile := s.config.TLSKeyfile
func (s *Server) Start() error {
if s.config.Listener == nil {
s.startDefaultListener(certfile, keyfile)
} else {
s.startCustomListener()
return s.startDefaultListener()
}
return s.startCustomListener()
}
func (s *Server) startDefaultListener(certfile, keyfile string) {
if certfile != "" && keyfile != "" {
s.logger.Fatal(s.ListenAndServeTLS(certfile, keyfile))
} else {
s.logger.Fatal(s.ListenAndServe())
func (s *Server) startDefaultListener() error {
c := s.config
if c.TLSCertfile != "" && c.TLSKeyfile != "" {
return s.ListenAndServeTLS(c.TLSCertfile, c.TLSKeyfile)
}
return s.ListenAndServe()
}
func (s *Server) startCustomListener() {
s.logger.Fatal(s.Serve(s.config.Listener))
func (s *Server) startCustomListener() error {
return s.Serve(s.config.Listener)
}
// ServeHTTP implements `http.Handler` interface.