Changeset 409 in code for trunk/downstream.go

Timestamp:

Aug 20, 2020, 6:05:01 PM (5 years ago)

Author:

contact

Message:

Nuke in-memory ring buffer

Instead, always read chat history from logs. Unify the implicit chat
history (pushing history to clients) and explicit chat history
(via the CHATHISTORY command).

Instead of keeping track of ring buffer cursors for each client, use
message IDs.

If necessary, the ring buffer could be re-introduced behind a
common MessageStore interface (could be useful when on-disk logs are
disabled).

References: ​https://todo.sr.ht/~emersion/soju/80

File:

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

trunk/downstream.go

@@ -851 +851 @@
                         delete(net.offlineClients, dc.clientName)
                 }
+
+                // Fast-forward history to last message
+                for target, history := range net.history {
+                        if ch, ok := net.channels[target]; ok && ch.Detached {
+                                continue
+                        }
+
+                        lastID, err := lastMsgID(net, target, time.Now())
+                        if err != nil {
+                                dc.logger.Printf("failed to get last message ID: %v", err)
+                                continue
+                        }
+                        history.clients[dc.clientName] = lastID
+                }
         })
 
@@ -857 +871 @@
 
 func (dc *downstreamConn) sendNetworkHistory(net *network) {
-        if dc.caps["draft/chathistory"] {
+        if dc.caps["draft/chathistory"] || dc.srv.LogPath == "" {
                 return
         }
@@ -865 +879 @@
                 }
 
-                seq, ok := history.clients[dc.clientName]
+                lastDelivered, ok := history.clients[dc.clientName]
                 if !ok {
                         continue
                 }
-                history.clients[dc.clientName] = history.ring.Cur()
-
-                consumer := history.ring.NewConsumer(seq)
+
+                limit := 4000
+                history, err := loadHistoryLatestID(dc.network, target, lastDelivered, limit)
+                if err != nil {
+                        dc.logger.Printf("failed to send implicit history for %q: %v", target, err)
+                        continue
+                }
 
                 batchRef := "history"
@@ -882 +900 @@
                 }
 
-                for {
-                        msg := consumer.Consume()
-                        if msg == nil {
-                                break
-                        }
-
+                for _, msg := range history {
                         // Don't replay all messages, because that would mess up client
                         // state. For instance we just sent the list of users, sending
@@ -901 +914 @@
 
                         if dc.caps["batch"] {
-                                msg = msg.Copy()
                                 msg.Tags["batch"] = irc.TagValue(batchRef)
                         }
-
                         dc.SendMessage(dc.marshalMessage(msg, net))
                 }