Changeset 423 in code for trunk/upstream.go

Timestamp:

Oct 25, 2020, 4:47:38 PM (5 years ago)

Author:

contact

Message:

Add message store abstraction

Introduce a messageStore type, which will allow for multiple
implementations (e.g. in the DB or in-memory instead of on-disk).

The message store is per-user so that we don't need to deal with locking
and it's easier to implement per-user limits.

File:

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

trunk/upstream.go

@@ -82 +82 @@
         // set of LIST commands in progress, per downstream
         pendingLISTDownstreamSet map[uint64]struct{}
-
-        messageLoggers map[string]*messageLogger
 }
 
@@ -183 +181 @@
                 availableMemberships:     stdMemberships,
                 pendingLISTDownstreamSet: make(map[uint64]struct{}),
-                messageLoggers:           make(map[string]*messageLogger),
         }
         return uc, nil
@@ -1612 +1609 @@
 
 func (uc *upstreamConn) appendLog(entity string, msg *irc.Message) {
-        if uc.srv.LogPath == "" {
+        if uc.user.msgStore == nil {
                 return
-        }
-
-        ml, ok := uc.messageLoggers[entity]
-        if !ok {
-                ml = newMessageLogger(uc.network, entity)
-                uc.messageLoggers[entity] = ml
         }
 
@@ -1629 +1620 @@
         history, ok := uc.network.history[entity]
         if !ok {
-                lastID, err := lastMsgID(uc.network, entity, time.Now())
+                lastID, err := uc.user.msgStore.LastMsgID(uc.network, entity, time.Now())
                 if err != nil {
                         uc.logger.Printf("failed to log message: failed to get last message ID: %v", err)
@@ -1653 +1644 @@
         }
 
-        msgID, err := ml.Append(msg)
+        msgID, err := uc.user.msgStore.Append(uc.network, entity, msg)
         if err != nil {
                 uc.logger.Printf("failed to log message: %v", err)