go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-11-06 08:59:21 +02:00
Code Issues Releases Activity

Fixed package dependencies

Browse Source 
Signed-off-by: Vishal Rana <vishal.rana@verizon.com>
This commit is contained in:
Vishal Rana
2016-02-09 13:37:38 -08:00
parent 92307b9a1f
commit 8444488a2b
8 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/fasthttp/response.go
View File

@@ -5,8 +5,8 @@ package fasthttp
import (
"io"
"github.com/labstack/echo"
"github.com/labstack/echo/engine"
"github.com/labstack/echo/logger"
"github.com/valyala/fasthttp"
)
@@ -18,11 +18,11 @@ type (
size int64
committed bool
writer io.Writer
logger logger.Logger
logger echo.Logger
}
)
func NewResponse(c *fasthttp.RequestCtx, l logger.Logger) *Response {
func NewResponse(c *fasthttp.RequestCtx, l echo.Logger) *Response {
return &Response{
context: c,
header: &ResponseHeader{c.Response.Header},

24
engine/fasthttp/server.go
View File

@@ -5,8 +5,8 @@ package fasthttp
import (
"net/http"
"github.com/labstack/echo"
"github.com/labstack/echo/engine"
"github.com/labstack/echo/logger"
"github.com/valyala/fasthttp"
)
@@ -15,16 +15,30 @@ type (
*http.Server
config *engine.Config
handler engine.HandlerFunc
logger logger.Logger
logger echo.Logger
}
)
func NewServer(c *engine.Config, h engine.HandlerFunc, l logger.Logger) *Server {
func New(addr string, e *echo.Echo) *Server {
c := &engine.Config{Address: addr}
return NewConfig(c, e)
}
func NewTLS(addr, certfile, keyfile string, e *echo.Echo) *Server {
c := &engine.Config{
Address: addr,
TLSCertfile: certfile,
TLSKeyfile: keyfile,
}
return NewConfig(c, e)
}
func NewConfig(c *engine.Config, e *echo.Echo) *Server {
return &Server{
Server: new(http.Server),
config: c,
handler: h,
logger: l,
handler: e.ServeHTTP,
logger: e.Logger(),
}
}

6
engine/standard/response.go
View File

@@ -4,8 +4,8 @@ import (
"io"
"net/http"
"github.com/labstack/echo"
"github.com/labstack/echo/engine"
"github.com/labstack/echo/logger"
)
type (
@@ -16,11 +16,11 @@ type (
size int64
committed bool
writer io.Writer
logger logger.Logger
logger echo.Logger
}
)
func NewResponse(w http.ResponseWriter, l logger.Logger) *Response {
func NewResponse(w http.ResponseWriter, l echo.Logger) *Response {
return &Response{
response: w,
header: &Header{w.Header()},

26
engine/standard/server.go
View File

@@ -4,8 +4,8 @@ import (
"net/http"
"sync"
"github.com/labstack/echo"
"github.com/labstack/echo/engine"
"github.com/labstack/echo/logger"
)
type (
@@ -14,7 +14,7 @@ type (
config *engine.Config
handler engine.HandlerFunc
pool *Pool
logger logger.Logger
logger echo.Logger
}
Pool struct {
@@ -25,11 +25,25 @@ type (
}
)
func NewServer(c *engine.Config, h engine.HandlerFunc, l logger.Logger) *Server {
func New(addr string, e *echo.Echo) *Server {
c := &engine.Config{Address: addr}
return NewConfig(c, e)
}
func NewTLS(addr, certfile, keyfile string, e *echo.Echo) *Server {
c := &engine.Config{
Address: addr,
TLSCertfile: certfile,
TLSKeyfile: keyfile,
}
return NewConfig(c, e)
}
func NewConfig(c *engine.Config, e *echo.Echo) *Server {
return &Server{
Server: new(http.Server),
config: c,
handler: h,
handler: e.ServeHTTP,
pool: &Pool{
request: sync.Pool{
New: func() interface{} {
@@ -38,7 +52,7 @@ func NewServer(c *engine.Config, h engine.HandlerFunc, l logger.Logger) *Server
},
response: sync.Pool{
New: func() interface{} {
return &Response{logger: l}
return &Response{logger: e.Logger()}
},
},
header: sync.Pool{
@@ -52,7 +66,7 @@ func NewServer(c *engine.Config, h engine.HandlerFunc, l logger.Logger) *Server
},
},
},
logger: l,
logger: e.Logger(),
}
}