arch/soju
1
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Get rid of Server.downstreamConns

Browse source 
This is unused right now. Let's remove it, we'll add it back if we
really need it.
This commit is contained in:
Simon Ser 2020-03-27 22:24:12 +01:00
parent 8c56e610ff
commit 551d41335e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server.go
View file

@ -55,9 +55,8 @@ type Server struct {
db *DB db *DB
lock sync.Mutex lock sync.Mutex
users map[string]*user users map[string]*user
downstreamConns []*downstreamConn
} }
func NewServer(db *DB) *Server { func NewServer(db *DB) *Server {
@ -112,10 +111,6 @@ func (s *Server) Serve(ln net.Listener) error {
dc := newDownstreamConn(s, netConn, nextDownstreamID) dc := newDownstreamConn(s, netConn, nextDownstreamID)
nextDownstreamID++ nextDownstreamID++
go func() { go func() {
s.lock.Lock()
s.downstreamConns = append(s.downstreamConns, dc)
s.lock.Unlock()
if err := dc.runUntilRegistered(); err != nil { if err := dc.runUntilRegistered(); err != nil {
dc.logger.Print(err) dc.logger.Print(err)
} else { } else {
@ -126,15 +121,6 @@ func (s *Server) Serve(ln net.Listener) error {
dc.user.events <- eventDownstreamDisconnected{dc} dc.user.events <- eventDownstreamDisconnected{dc}
} }
dc.Close() dc.Close()
s.lock.Lock()
for i := range s.downstreamConns {
if s.downstreamConns[i] == dc {
s.downstreamConns = append(s.downstreamConns[:i], s.downstreamConns[i+1:]...)
break
}
}
s.lock.Unlock()
}() }()
} }
} }