Changeset 667 in code for trunk/downstream.go

Timestamp:

Nov 3, 2021, 5:21:05 PM (4 years ago)

Author:

contact

Message:

msgstore: add context to messageStore methods

This allows setting a hard timeout.

File:

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

trunk/downstream.go

@@ -1329 +1329 @@
         ch := net.channels.Value(target)
 
+        ctx, cancel := context.WithTimeout(context.TODO(), messageStoreTimeout)
+        defer cancel()
+
         limit := 4000
         targetCM := net.casemap(target)
-        history, err := dc.user.msgStore.LoadLatestID(&net.Network, targetCM, msgID, limit)
+        history, err := dc.user.msgStore.LoadLatestID(ctx, &net.Network, targetCM, msgID, limit)
         if err != nil {
                 dc.logger.Printf("failed to send backlog for %q: %v", target, err)
@@ -2335 +2338 @@
                 eventPlayback := dc.caps["draft/event-playback"]
 
+                ctx, cancel := context.WithTimeout(context.TODO(), messageStoreTimeout)
+                defer cancel()
+
                 var history []*irc.Message
                 switch subcommand {
                 case "BEFORE":
-                        history, err = store.LoadBeforeTime(&network.Network, entity, bounds[0], time.Time{}, limit, eventPlayback)
+                        history, err = store.LoadBeforeTime(ctx, &network.Network, entity, bounds[0], time.Time{}, limit, eventPlayback)
                 case "AFTER":
-                        history, err = store.LoadAfterTime(&network.Network, entity, bounds[0], time.Now(), limit, eventPlayback)
+                        history, err = store.LoadAfterTime(ctx, &network.Network, entity, bounds[0], time.Now(), limit, eventPlayback)
                 case "BETWEEN":
                         if bounds[0].Before(bounds[1]) {
-                                history, err = store.LoadAfterTime(&network.Network, entity, bounds[0], bounds[1], limit, eventPlayback)
+                                history, err = store.LoadAfterTime(ctx, &network.Network, entity, bounds[0], bounds[1], limit, eventPlayback)
                         } else {
-                                history, err = store.LoadBeforeTime(&network.Network, entity, bounds[0], bounds[1], limit, eventPlayback)
+                                history, err = store.LoadBeforeTime(ctx, &network.Network, entity, bounds[0], bounds[1], limit, eventPlayback)
                         }
                 case "TARGETS":
                         // TODO: support TARGETS in multi-upstream mode
-                        targets, err := store.ListTargets(&network.Network, bounds[0], bounds[1], limit, eventPlayback)
+                        targets, err := store.ListTargets(ctx, &network.Network, bounds[0], bounds[1], limit, eventPlayback)
                         if err != nil {
                                 dc.logger.Printf("failed fetching targets for chathistory: %v", err)