GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #195 from slingamn/stopevent 

clean up stopEvent (requires go v1.10)
This commit is contained in:
Daniel Oaks 2018-02-23 07:49:22 -08:00 committed by GitHub
parent 25f8b15232 02161184cf
commit 04d7792ed2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irc/server.go
View File

@ -79,8 +79,6 @@ type ListenerWrapper struct {
listener net.Listener listener net.Listener
tlsConfig *tls.Config tlsConfig *tls.Config
shouldStop bool shouldStop bool
// lets the ListenerWrapper inform the server that it has stopped:
stopEvent chan bool
// protects atomic update of tlsConfig and shouldStop: // protects atomic update of tlsConfig and shouldStop:
configMutex sync.Mutex // tier 1 configMutex sync.Mutex // tier 1
} }
@ -364,7 +362,6 @@ func (server *Server) createListener(addr string, tlsConfig *tls.Config) *Listen
listener: listener, listener: listener,
tlsConfig: tlsConfig, tlsConfig: tlsConfig,
shouldStop: false, shouldStop: false,
stopEvent: make(chan bool, 1),
} }
var shouldStop bool var shouldStop bool
@ -395,7 +392,6 @@ func (server *Server) createListener(addr string, tlsConfig *tls.Config) *Listen
if shouldStop { if shouldStop {
listener.Close() listener.Close()
wrapper.stopEvent <- true
return return
} }
} }
@ -1085,8 +1081,6 @@ func (server *Server) setupListeners(config *Config) {
} else { } else {
// tell the listener it should stop by interrupting its Accept() call: // tell the listener it should stop by interrupting its Accept() call:
currentListener.listener.Close() currentListener.listener.Close()
// TODO(golang1.10) delete stopEvent once issue #21856 is released
<-currentListener.stopEvent
delete(server.listeners, addr) delete(server.listeners, addr)
server.logger.Info("listeners", fmt.Sprintf("stopped listening on %s.", addr)) server.logger.Info("listeners", fmt.Sprintf("stopped listening on %s.", addr))
} }