diff options
| author | Shulhan <ms@kilabit.info> | 2023-02-25 19:36:18 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2023-02-25 19:56:24 +0700 |
| commit | fee20f0aeb51113a995c8fe21ff1e34f4244eb8f (patch) | |
| tree | 79e25493dde2931cefa5fbb812717355bcef8cce /lib/http/server.go | |
| parent | 4100f2dbd433ec885c3c9f5eb963ba98bb1ab1e4 (diff) | |
| download | pakakeh.go-fee20f0aeb51113a995c8fe21ff1e34f4244eb8f.tar.xz | |
all: access embedded field or methods using the type name
This is for clarity in the code, better to be explicit by typing where
the field or methods come from.
Diffstat (limited to 'lib/http/server.go')
| -rw-r--r-- | lib/http/server.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/http/server.go b/lib/http/server.go index b81e414f..bbdc8007 100644 --- a/lib/http/server.go +++ b/lib/http/server.go @@ -56,13 +56,13 @@ func NewServer(opts *ServerOptions) (srv *Server, err error) { srv.Server = opts.Conn srv.Server.Addr = opts.Address - srv.Handler = srv + srv.Server.Handler = srv - if srv.ReadTimeout == 0 { - srv.ReadTimeout = defRWTimeout + if srv.Server.ReadTimeout == 0 { + srv.Server.ReadTimeout = defRWTimeout } - if srv.WriteTimeout == 0 { - srv.WriteTimeout = defRWTimeout + if srv.Server.WriteTimeout == 0 { + srv.Server.WriteTimeout = defRWTimeout } if srv.Options.Memfs != nil { err = srv.Options.Memfs.Init() @@ -278,10 +278,10 @@ func (srv *Server) ServeHTTP(res http.ResponseWriter, req *http.Request) { // Start the HTTP server. func (srv *Server) Start() (err error) { - if srv.TLSConfig == nil { - err = srv.ListenAndServe() + if srv.Server.TLSConfig == nil { + err = srv.Server.ListenAndServe() } else { - err = srv.ListenAndServeTLS("", "") + err = srv.Server.ListenAndServeTLS("", "") } if errors.Is(err, http.ErrServerClosed) { err = nil @@ -298,7 +298,7 @@ func (srv *Server) Stop(wait time.Duration) (err error) { } ctx, cancel := context.WithTimeout(context.Background(), wait) defer cancel() - return srv.Shutdown(ctx) + return srv.Server.Shutdown(ctx) } func (srv *Server) getFSNode(reqPath string) (node *memfs.Node) { |
