Changeset 423 in code for trunk/user.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/user.go (modified) (4 diffs)

trunk/user.go

@@ -250 +250 @@
         networks        []*network
         downstreamConns []*downstreamConn
+        msgStore        *messageStore
 
         // LIST commands in progress
@@ -262 +263 @@
 
 func newUser(srv *Server, record *User) *user {
+        var msgStore *messageStore
+        if srv.LogPath != "" {
+                msgStore = newMessageStore(srv.LogPath, record.Username)
+        }
+
         return &user{
-                User:   *record,
-                srv:    srv,
-                events: make(chan event, 64),
-                done:   make(chan struct{}),
+                User:     *record,
+                srv:      srv,
+                events:   make(chan event, 64),
+                done:     make(chan struct{}),
+                msgStore: msgStore,
         }
 }
@@ -313 +320 @@
 
 func (u *user) run() {
-        defer close(u.done)
+        defer func() {
+                if u.msgStore != nil {
+                        if err := u.msgStore.Close(); err != nil {
+                                u.srv.Logger.Printf("failed to close message store for user %q: %v", u.Username, err)
+                        }
+                }
+                close(u.done)
+        }()
 
         networks, err := u.srv.db.ListNetworks(u.ID)
@@ -460 +474 @@
         uc.network.conn = nil
 
-        for _, ml := range uc.messageLoggers {
-                if err := ml.Close(); err != nil {
-                        uc.logger.Printf("failed to close message logger: %v", err)
-                }
-        }
-
         uc.endPendingLISTs(true)