Changeset 104 in code for trunk/downstream.go

Timestamp:

Mar 16, 2020, 1:05:48 PM (5 years ago)

Author:

contact

Message:

Rename consumption to ringMessage

File:

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

trunk/downstream.go

@@ -48 +48 @@
 }}
 
-type consumption struct {
+type ringMessage struct {
         consumer     *RingConsumer
         upstreamConn *upstreamConn
@@ -59 +59 @@
         logger       Logger
         outgoing     chan *irc.Message
-        consumptions chan consumption
+        ringMessages chan ringMessage
         closed       chan struct{}
 
@@ -79 +79 @@
                 logger:       &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())},
                 outgoing:     make(chan *irc.Message, 64),
-                consumptions: make(chan consumption),
+                ringMessages: make(chan ringMessage),
                 closed:       make(chan struct{}),
         }
@@ -223 +223 @@
                         }
                         err = dc.irc.WriteMessage(msg)
-                case consumption := <-dc.consumptions:
-                        consumer, uc := consumption.consumer, consumption.upstreamConn
+                case ringMessage := <-dc.ringMessages:
+                        consumer, uc := ringMessage.consumer, ringMessage.upstreamConn
                         for {
                                 msg := consumer.Peek()
@@ -428 +428 @@
 
         dc.forEachUpstream(func(uc *upstreamConn) {
-                // TODO: fix races accessing upstream connection data
                 for _, ch := range uc.channels {
                         if ch.complete {
@@ -451 +450 @@
                                 select {
                                 case <-ch:
-                                        dc.consumptions <- consumption{consumer, uc}
+                                        dc.ringMessages <- ringMessage{consumer, uc}
                                 case <-dc.closed:
                                         closed = true