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

Jump to bottom

server: do not ignore listening errors #523

Merged
merged 1 commit into from Jan 6, 2023
Merged

server: do not ignore listening errors #523

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 13 additions & 11 deletions server/server.go
View file
Open in desktop
Expand Up @@ -537,32 +537,34 @@ func (s *Server) Run() {
)

if !s.TLSListenerOnly {
srvr := &http.Server{
Addr: s.ListenerString,
Handler: h,
}

listening = true
s.logger.Printf("listening on port: %v\n", s.ListenerString)
s.logger.Printf("starting to listen on: %v\n", s.ListenerString)

go func() {
_ = srvr.ListenAndServe()
srvr := &http.Server{
Addr: s.ListenerString,
Handler: h,
}

if err := srvr.ListenAndServe(); err != nil {
s.logger.Fatal(err)
}
}()
}

if s.TLSListenerString != "" {
listening = true
s.logger.Printf("listening on port: %v\n", s.TLSListenerString)
s.logger.Printf("starting to listen for TLS on: %v\n", s.TLSListenerString)

go func() {
s := &http.Server{
srvr := &http.Server{
Addr: s.TLSListenerString,
Handler: h,
TLSConfig: s.tlsConfig,
}

if err := s.ListenAndServeTLS("", ""); err != nil {
panic(err)
if err := srvr.ListenAndServeTLS("", ""); err != nil {
s.logger.Fatal(err)
}
}()
}
Expand Down