go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-07-15 01:34:53 +02:00
Code Issues Releases Activity

Engine standard > http.Server as private field

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana
2016-03-08 08:44:13 -08:00
parent f4a5abc8b2
commit 6ed0b57228
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/fasthttp/server.go
View File

@ -30,19 +30,19 @@ type (
func New(addr string) *Server { func New(addr string) *Server {
c := &engine.Config{Address: addr} c := &engine.Config{Address: addr}
return NewConfig(c) return NewWithConfig(c)
} }
func NewTLS(addr, certfile, keyfile string) *Server { func NewWithTLS(addr, certfile, keyfile string) *Server {
c := &engine.Config{ c := &engine.Config{
Address: addr, Address: addr,
TLSCertfile: certfile, TLSCertfile: certfile,
TLSKeyfile: keyfile, TLSKeyfile: keyfile,
} }
return NewConfig(c) return NewWithConfig(c)
} }
func NewConfig(c *engine.Config) (s *Server) { func NewWithConfig(c *engine.Config) (s *Server) {
s = &Server{ s = &Server{
config: c, config: c,
pool: &Pool{ pool: &Pool{

24
engine/standard/server.go
View File

@ -11,7 +11,7 @@ import (
type ( type (
Server struct { Server struct {
*http.Server server *http.Server
config *engine.Config config *engine.Config
handler engine.Handler handler engine.Handler
pool *Pool pool *Pool
@ -28,21 +28,21 @@ type (
func New(addr string) *Server { func New(addr string) *Server {
c := &engine.Config{Address: addr} c := &engine.Config{Address: addr}
return NewConfig(c) return NewWithConfig(c)
} }
func NewTLS(addr, certfile, keyfile string) *Server { func NewWithTLS(addr, certfile, keyfile string) *Server {
c := &engine.Config{ c := &engine.Config{
Address: addr, Address: addr,
TLSCertfile: certfile, TLSCertfile: certfile,
TLSKeyfile: keyfile, TLSKeyfile: keyfile,
} }
return NewConfig(c) return NewWithConfig(c)
} }
func NewConfig(c *engine.Config) (s *Server) { func NewWithConfig(c *engine.Config) (s *Server) {
s = &Server{ s = &Server{
Server: new(http.Server), server: new(http.Server),
config: c, config: c,
pool: &Pool{ pool: &Pool{
request: sync.Pool{ request: sync.Pool{
@ -83,14 +83,14 @@ func (s *Server) SetLogger(l *log.Logger) {
} }
func (s *Server) Start() { func (s *Server) Start() {
s.Addr = s.config.Address s.server.Addr = s.config.Address
s.Handler = s s.server.Handler = s
certfile := s.config.TLSCertfile certfile := s.config.TLSCertfile
keyfile := s.config.TLSKeyfile keyfile := s.config.TLSKeyfile
if certfile != "" && keyfile != "" { if certfile != "" && keyfile != "" {
s.logger.Fatal(s.ListenAndServeTLS(certfile, keyfile)) s.logger.Fatal(s.server.ListenAndServeTLS(certfile, keyfile))
} else { } else {
s.logger.Fatal(s.ListenAndServe()) s.logger.Fatal(s.server.ListenAndServe())
} }
} }
@ -118,6 +118,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
s.pool.header.Put(resHdr) s.pool.header.Put(resHdr)
} }
func (s *Server) Server() *http.Server {
return s.server
}
// WrapHandler wraps `http.Handler` into `echo.HandlerFunc`. // WrapHandler wraps `http.Handler` into `echo.HandlerFunc`.
func WrapHandler(h http.Handler) echo.HandlerFunc { func WrapHandler(h http.Handler) echo.HandlerFunc {
return func(c echo.Context) error { return func(c echo.Context) error {