extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-01-19 04:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix exit signal handling

Browse Source
This commit is contained in:
Zoltán Papp 2024-08-21 15:54:36 +02:00
parent 3bd820f2e4
commit 7633cca3b1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
relay/cmd/main.go
View File

@ -166,11 +166,13 @@ func execute(cmd *cobra.Command, args []string) error {
return fmt.Errorf("failed to create relay server: %v", err) return fmt.Errorf("failed to create relay server: %v", err)
} }
log.Infof("server will be available on: %s", srv.InstanceURL()) log.Infof("server will be available on: %s", srv.InstanceURL())
err = srv.Listen(srvListenerCfg) go func() {
if err != nil { if err := srv.Listen(srvListenerCfg); err != nil {
return fmt.Errorf("failed to bind server: %s", err) log.Errorf("failed to bind server: %s", err)
} }
}()
// it will block until exit signal
waitForExitSignal() waitForExitSignal()
err = srv.Close() err = srv.Close()

1
relay/server/listener/ws/listener.go
View File

@ -38,7 +38,6 @@ func (l *Listener) Listen(acceptFn func(conn net.Conn)) error {
var err error var err error
if l.TLSConfig != nil { if l.TLSConfig != nil {
err = l.server.ListenAndServeTLS("", "") err = l.server.ListenAndServeTLS("", "")
} else { } else {
err = l.server.ListenAndServe() err = l.server.ListenAndServe()
} }