Skip to content

Commit 2fab27a

Browse files
committed
Refactor tls config
Signed-off-by: Vishal Rana <vr@labstack.com>
1 parent 2eb5d97 commit 2fab27a

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

engine/engine.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ type (
199199
Config struct {
200200
Address string // TCP address to listen on.
201201
Listener net.Listener // Custom `net.Listener`. If set, server accepts connections on it.
202-
TLSCertfile string // TLS certificate file path.
203-
TLSKeyfile string // TLS key file path.
202+
TLSCertFile string // TLS certificate file path.
203+
TLSKeyFile string // TLS key file path.
204204
ReadTimeout time.Duration // Maximum duration before timing out read of the request.
205205
WriteTimeout time.Duration // Maximum duration before timing out write of the response.
206206
}

engine/fasthttp/server.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func New(addr string) *Server {
4141
func WithTLS(addr, certFile, keyFile string) *Server {
4242
c := engine.Config{
4343
Address: addr,
44-
TLSCertfile: certFile,
45-
TLSKeyfile: keyFile,
44+
TLSCertFile: certFile,
45+
TLSKeyFile: keyFile,
4646
}
4747
return WithConfig(c)
4848
}
@@ -111,16 +111,16 @@ func (s *Server) Start() error {
111111

112112
func (s *Server) startDefaultListener() error {
113113
c := s.config
114-
if c.TLSCertfile != "" && c.TLSKeyfile != "" {
115-
return s.ListenAndServeTLS(c.Address, c.TLSCertfile, c.TLSKeyfile)
114+
if c.TLSCertFile != "" && c.TLSKeyFile != "" {
115+
return s.ListenAndServeTLS(c.Address, c.TLSCertFile, c.TLSKeyFile)
116116
}
117117
return s.ListenAndServe(c.Address)
118118
}
119119

120120
func (s *Server) startCustomListener() error {
121121
c := s.config
122-
if c.TLSCertfile != "" && c.TLSKeyfile != "" {
123-
return s.ServeTLS(c.Listener, c.TLSCertfile, c.TLSKeyfile)
122+
if c.TLSCertFile != "" && c.TLSKeyFile != "" {
123+
return s.ServeTLS(c.Listener, c.TLSCertFile, c.TLSKeyFile)
124124
}
125125
return s.Serve(c.Listener)
126126
}

engine/standard/server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func New(addr string) *Server {
3939
func WithTLS(addr, certFile, keyFile string) *Server {
4040
c := engine.Config{
4141
Address: addr,
42-
TLSCertfile: certFile,
43-
TLSKeyfile: keyFile,
42+
TLSCertFile: certFile,
43+
TLSKeyFile: keyFile,
4444
}
4545
return WithConfig(c)
4646
}
@@ -109,8 +109,8 @@ func (s *Server) Start() error {
109109

110110
func (s *Server) startDefaultListener() error {
111111
c := s.config
112-
if c.TLSCertfile != "" && c.TLSKeyfile != "" {
113-
return s.ListenAndServeTLS(c.TLSCertfile, c.TLSKeyfile)
112+
if c.TLSCertFile != "" && c.TLSKeyFile != "" {
113+
return s.ListenAndServeTLS(c.TLSCertFile, c.TLSKeyFile)
114114
}
115115
return s.ListenAndServe()
116116
}

test/server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func New(addr string) *Server {
3333
func NewTLS(addr, certFile, keyFile string) *Server {
3434
c := &engine.Config{
3535
Address: addr,
36-
TLSCertfile: certFile,
37-
TLSKeyfile: keyFile,
36+
TLSCertFile: certFile,
37+
TLSKeyFile: keyFile,
3838
}
3939
return NewConfig(c)
4040
}
@@ -84,8 +84,8 @@ func (s *Server) SetLogger(l *log.Logger) {
8484
func (s *Server) Start() {
8585
s.Addr = s.config.Address
8686
s.Handler = s
87-
certFile := s.config.TLSCertfile
88-
keyFile := s.config.TLSKeyfile
87+
certFile := s.config.TLSCertFile
88+
keyFile := s.config.TLSKeyFile
8989
if certFile != "" && keyFile != "" {
9090
s.logger.Fatal(s.ListenAndServeTLS(certFile, keyFile))
9191
} else {

0 commit comments

Comments
 (0)