Changeset 24 in code for trunk

Timestamp:

Feb 6, 2020, 8:30:44 PM (5 years ago)

Author:

contact

Message:

Remove downstream conn from list on disconnect

File:

• trunk/server.go (modified) (3 diffs)

trunk/server.go

@@ -4 +4 @@
         "fmt"
         "net"
+        "sync"
 
         "gopkg.in/irc.v3"
@@ -43 +44 @@
         Upstreams []Upstream // TODO: per-user
 
+        lock            sync.Mutex
         downstreamConns []*downstreamConn
 }
@@ -75 +77 @@
 
                 conn := newDownstreamConn(s, netConn)
-                s.downstreamConns = append(s.downstreamConns, conn)
                 go func() {
+                        s.lock.Lock()
+                        s.downstreamConns = append(s.downstreamConns, conn)
+                        s.lock.Unlock()
                         if err := conn.readMessages(); err != nil {
                                 conn.logger.Printf("failed to handle messages: %v", err)
                         }
+                        s.lock.Lock()
+                        for i, c := range s.downstreamConns {
+                                if c == conn {
+                                        s.downstreamConns = append(s.downstreamConns[:i], s.downstreamConns[i+1:]...)
+                                        break
+                                }
+                        }
+                        s.lock.Unlock()
                 }()
         }