Skip to content
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

fix: close connection on shutdown in single port mode #101

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: close connection on shutdown in single port mode #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,13 @@ func (s *Server) processRequest() error {
// Shutdown blocks until all outstanding requests are processed or timed out.
// Calling Shutdown from the handler or hook might cause deadlock.
func (s *Server) Shutdown() {
if !s.singlePort {
s.Lock()
// Connection could not exist if Serve or
// ListenAndServe was never called.
if s.conn != nil {
s.conn.Close()
}
s.Unlock()
s.Lock()
// Connection could not exist if Serve or
// ListenAndServe was never called.
if s.conn != nil {
s.conn.Close()
}
s.Unlock()
s.cancelFn()
if !s.singlePort {
s.wg.Wait()
Expand Down
Loading