Fix swarm inbox listener close race

1 file · +10 -2

M internal/swarm/inbox.go +10 -2


@@ -162,6 +162,7 @@ type Listener struct {
162	162		active net.Conn
163	163		out chan string
164	164		done chan struct{}
	165	+	wg sync.WaitGroup
165	166		}
166	167
167	168		// Listen creates the socket at path and starts accepting. The

@@ -215,7 +216,10 @@ func (l *Listener) Close() error {
215	216		}
216	217
217	218		func (l *Listener) acceptLoop() {
218		-	defer close(l.out)
	219	+	defer func() {
	220	+	l.wg.Wait()
	221	+	close(l.out)
	222	+	}()
219	223		for {
220	224		c, err := l.ln.Accept()
221	225		if err != nil {

@@ -234,7 +238,11 @@ func (l *Listener) acceptLoop() {
234	238		}
235	239		l.active = c
236	240		l.mu.Unlock()
237		-	go l.readLoop(c)
	241	+	l.wg.Add(1)
	242	+	go func() {
	243	+	defer l.wg.Done()
	244	+	l.readLoop(c)
	245	+	}()
238	246		}
239	247		}
240	248

 	active net.Conn
 	out    chan string
 	done   chan struct{}
+	wg     sync.WaitGroup
 }
 // Listen creates the socket at path and starts accepting. The
 }
 func (l *Listener) acceptLoop() {
-	defer close(l.out)
+	defer func() {
+		l.wg.Wait()
+		close(l.out)
+	}()
 	for {
 		c, err := l.ln.Accept()
 		if err != nil {
 		}
 		l.active = c
 		l.mu.Unlock()
-		go l.readLoop(c)
+		l.wg.Add(1)
+		go func() {
+			defer l.wg.Done()
+			l.readLoop(c)
+		}()
 	}
 }