Changeset 143 in code for trunk

Timestamp:

Mar 25, 2020, 9:53:08 AM (5 years ago)

Author:

contact

Message:

Move upstreamConn.ring to network

This handles upstream disconnection and re-connection better.

Location:

trunk

Files:

• downstream.go (modified) (6 diffs)
• upstream.go (modified) (3 diffs)
• user.go (modified) (2 diffs)

trunk/downstream.go

@@ -700 +700 @@
                         }
                 }
-
+        })
+
+        dc.forEachNetwork(func(net *network) {
                 historyName := dc.rawUsername
 
@@ -706 +708 @@
                 var seqPtr *uint64
                 if firstDownstream {
-                        uc.network.lock.Lock()
-                        seq, ok := uc.network.history[historyName]
-                        uc.network.lock.Unlock()
+                        net.lock.Lock()
+                        seq, ok := net.history[historyName]
+                        net.lock.Unlock()
                         if ok {
                                 seqPtr = &seq
@@ -715 +717 @@
 
                 // TODO: we need to create a consumer when adding networks on-the-fly
-                consumer, ch := uc.ring.NewConsumer(seqPtr)
+                consumer, ch := net.ring.NewConsumer(seqPtr)
                 go func() {
                         for {
@@ -721 +723 @@
                                 select {
                                 case <-ch:
+                                        uc := net.upstream()
+                                        if uc == nil {
+                                                dc.logger.Printf("ignoring messages for upstream %q: upstream is disconnected", net.Addr)
+                                                break
+                                        }
                                         dc.ringMessages <- ringMessage{consumer, uc}
                                 case <-dc.closed:
@@ -738 +745 @@
 
                         if lastDownstream {
-                                uc.network.lock.Lock()
-                                uc.network.history[historyName] = seq
-                                uc.network.lock.Unlock()
+                                net.lock.Lock()
+                                net.history[historyName] = seq
+                                net.lock.Unlock()
                         }
                 }()
@@ -1087 +1094 @@
                         dc.lock.Unlock()
 
-                        uc.ring.Produce(echoMsg)
+                        uc.network.ring.Produce(echoMsg)
                 }
         default:

trunk/upstream.go

@@ -35 +35 @@
         user     *user
         outgoing chan<- *irc.Message
-        ring     *Ring
 
         serverName            string
@@ -81 +80 @@
                 user:                  network.user,
                 outgoing:              outgoing,
-                ring:                  NewRing(network.user.srv.RingCap),
                 channels:              make(map[string]*upstreamChannel),
                 caps:                  make(map[string]string),
@@ -875 +873 @@
                 }
 
-                uc.ring.Produce(msg)
+                uc.network.ring.Produce(msg)
         case "INVITE":
                 var nick string

trunk/user.go

@@ -21 +21 @@
         Network
         user *user
+        ring *Ring
 
         lock    sync.Mutex
@@ -31 +32 @@
                 Network: *record,
                 user:    user,
+                ring:    NewRing(user.srv.RingCap),
                 history: make(map[string]uint64),
         }