go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-04-27 12:32:09 +02:00
Code Issues Releases Activity

Refactor tls config

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-06-16 14:25:32 -07:00
parent 2eb5d97b19
commit 2fab27a378
4 changed files with 16 additions and 16 deletions
engine
engine.go
fasthttp
server.go
standard
server.go
test
server.go

4
engine/engine.go

@ -199,8 +199,8 @@ type (
Config struct { Config struct {
Address string // TCP address to listen on. Address string // TCP address to listen on.
Listener net.Listener // Custom `net.Listener`. If set, server accepts connections on it. Listener net.Listener // Custom `net.Listener`. If set, server accepts connections on it.
TLSCertfile string // TLS certificate file path. TLSCertFile string // TLS certificate file path.
TLSKeyfile string // TLS key file path. TLSKeyFile string // TLS key file path.
ReadTimeout time.Duration // Maximum duration before timing out read of the request. ReadTimeout time.Duration // Maximum duration before timing out read of the request.
WriteTimeout time.Duration // Maximum duration before timing out write of the response. WriteTimeout time.Duration // Maximum duration before timing out write of the response.
} }

12
engine/fasthttp/server.go

@ -41,8 +41,8 @@ func New(addr string) *Server {
func WithTLS(addr, certFile, keyFile string) *Server { func WithTLS(addr, certFile, keyFile string) *Server {
c := engine.Config{ c := engine.Config{
Address: addr, Address: addr,
TLSCertfile: certFile, TLSCertFile: certFile,
TLSKeyfile: keyFile, TLSKeyFile: keyFile,
} }
return WithConfig(c) return WithConfig(c)
} }
@ -111,16 +111,16 @@ func (s *Server) Start() error {
func (s *Server) startDefaultListener() error { func (s *Server) startDefaultListener() error {
c := s.config c := s.config
if c.TLSCertfile != "" && c.TLSKeyfile != "" { if c.TLSCertFile != "" && c.TLSKeyFile != "" {
return s.ListenAndServeTLS(c.Address, c.TLSCertfile, c.TLSKeyfile) return s.ListenAndServeTLS(c.Address, c.TLSCertFile, c.TLSKeyFile)
} }
return s.ListenAndServe(c.Address) return s.ListenAndServe(c.Address)
} }
func (s *Server) startCustomListener() error { func (s *Server) startCustomListener() error {
c := s.config c := s.config
if c.TLSCertfile != "" && c.TLSKeyfile != "" { if c.TLSCertFile != "" && c.TLSKeyFile != "" {
return s.ServeTLS(c.Listener, c.TLSCertfile, c.TLSKeyfile) return s.ServeTLS(c.Listener, c.TLSCertFile, c.TLSKeyFile)
} }
return s.Serve(c.Listener) return s.Serve(c.Listener)
} }

8
engine/standard/server.go

@ -39,8 +39,8 @@ func New(addr string) *Server {
func WithTLS(addr, certFile, keyFile string) *Server { func WithTLS(addr, certFile, keyFile string) *Server {
c := engine.Config{ c := engine.Config{
Address: addr, Address: addr,
TLSCertfile: certFile, TLSCertFile: certFile,
TLSKeyfile: keyFile, TLSKeyFile: keyFile,
} }
return WithConfig(c) return WithConfig(c)
} }
@ -109,8 +109,8 @@ func (s *Server) Start() error {
func (s *Server) startDefaultListener() error { func (s *Server) startDefaultListener() error {
c := s.config c := s.config
if c.TLSCertfile != "" && c.TLSKeyfile != "" { if c.TLSCertFile != "" && c.TLSKeyFile != "" {
return s.ListenAndServeTLS(c.TLSCertfile, c.TLSKeyfile) return s.ListenAndServeTLS(c.TLSCertFile, c.TLSKeyFile)
} }
return s.ListenAndServe() return s.ListenAndServe()
} }

8
test/server.go

@ -33,8 +33,8 @@ func New(addr string) *Server {
func NewTLS(addr, certFile, keyFile string) *Server { func NewTLS(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 NewConfig(c)
} }
@ -84,8 +84,8 @@ func (s *Server) SetLogger(l *log.Logger) {
func (s *Server) Start() { func (s *Server) Start() {
s.Addr = s.config.Address s.Addr = s.config.Address
s.Handler = s s.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.ListenAndServeTLS(certFile, keyFile))
} else { } else {