Skip to content

Fixups; default to :http for ListenAndServe, remove unused vars #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aviddiviner wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixups; default to :http for ListenAndServe, remove unused vars #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ab531e
Fixups; default to :http for ListenAndServe, remove unused vars
aviddiviner Dec 23, 2016
811f5b3
Set keep-alives on connections from ListenAndServe()
aviddiviner Dec 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,10 @@ func NewWithServer(s *http.Server) *GracefulServer {
func NewWithOptions(o Options) *GracefulServer {
var listener *GracefulListener
if o.Listener != nil {
g, ok := o.Listener.(*GracefulListener)
if !ok {
listener = NewListener(o.Listener)
if gl, ok := o.Listener.(*GracefulListener); ok {
listener = gl
} else {
listener = g
listener = NewListener(o.Listener)
}
}
if o.Server == nil {
Expand Down Expand Up @@ -138,22 +137,22 @@ func (gs *GracefulServer) BlockingClose() bool {
// ListenAndServe provides a graceful equivalent of net/http.Serve.ListenAndServe.
func (gs *GracefulServer) ListenAndServe() error {
if gs.listener == nil {
oldListener, err := net.Listen("tcp", gs.Addr)
addr := gs.Addr
if addr == "" {
addr = ":http"
}
ln, err := net.Listen("tcp", addr)
if err != nil {
return err
}
gs.listener = NewListener(oldListener.(*net.TCPListener))
gs.listener = NewListener(TCPKeepAliveListener{ln.(*net.TCPListener)})
}
return gs.Serve(gs.listener)
}

// ListenAndServeTLS provides a graceful equivalent of net/http.Serve.ListenAndServeTLS.
func (gs *GracefulServer) ListenAndServeTLS(certFile, keyFile string) error {
// direct lift from net/http/server.go
addr := gs.Addr
if addr == "" {
addr = ":https"
}
config := &tls.Config{}
if gs.TLSConfig != nil {
*config = *gs.TLSConfig
Expand Down