Changeset 231 in code for trunk/downstream.go

Timestamp:

Apr 6, 2020, 4:31:48 PM (5 years ago)

Author:

contact

Message:

Remove downstreamConn.ringConsumers

We no longer need long-lived ring buffer consumers now that
upstreamConn.produce dispatches messages to downstream connections.

File:

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

trunk/downstream.go

@@ -67 +67 @@
         network     *network // can be nil
 
-        ringConsumers map[*network]*RingConsumer
         ourMessages map[*irc.Message]struct{}
         caps        map[string]bool
@@ -80 +79 @@
         logger := &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())}
         dc := &downstreamConn{
-                conn:          *newConn(srv, netConn, logger),
-                id:            id,
-                ringConsumers: make(map[*network]*RingConsumer),
-                ourMessages:   make(map[*irc.Message]struct{}),
-                caps:          make(map[string]bool),
+                conn:        *newConn(srv, netConn, logger),
+                id:          id,
+                ourMessages: make(map[*irc.Message]struct{}),
+                caps:        make(map[string]bool),
         }
         dc.hostname = netConn.RemoteAddr().String()
@@ -684 +682 @@
 
                 consumer := net.ring.NewConsumer(seqPtr)
-                dc.ringConsumers[net] = consumer
 
                 // TODO: this means all history is lost when trying to send it while the