Changeset 501 in code for trunk/user.go

Timestamp:

Apr 13, 2021, 6:12:49 PM (4 years ago)

Author:

contact

Message:

Add per-network logger

File:

• trunk/user.go (modified) (9 diffs)

trunk/user.go

@@ -110 +110 @@
         Network
         user    *user
+        logger  Logger
         stopped chan struct{}
 
@@ -120 +121 @@
 
 func newNetwork(user *user, record *Network, channels []Channel) *network {
+        logger := &prefixLogger{user.logger, fmt.Sprintf("network %q: ", record.GetName())}
+
         m := channelCasemapMap{newCasemapMap(0)}
         for _, ch := range channels {
@@ -129 +132 @@
                 Network:   *record,
                 user:      user,
+                logger:    logger,
                 stopped:   make(chan struct{}),
                 channels:  m,
@@ -174 +178 @@
                 if dur := time.Now().Sub(lastTry); dur < retryConnectDelay {
                         delay := retryConnectDelay - dur
-                        net.user.logger.Printf("waiting %v before trying to reconnect to %q", delay.Truncate(time.Second), net.Addr)
+                        net.logger.Printf("waiting %v before trying to reconnect to %q", delay.Truncate(time.Second), net.Addr)
                         time.Sleep(delay)
                 }
@@ -181 +185 @@
                 uc, err := connectToUpstream(net)
                 if err != nil {
-                        net.user.logger.Printf("failed to connect to upstream server %q: %v", net.Addr, err)
+                        net.logger.Printf("failed to connect to upstream server %q: %v", net.Addr, err)
                         net.user.events <- eventUpstreamConnectionError{net, fmt.Errorf("failed to connect: %v", err)}
                         continue
@@ -234 +238 @@
         }
 
-        net.user.logger.Printf("network %q: detaching channel %q", net.GetName(), ch.Name)
+        net.logger.Printf("detaching channel %q", ch.Name)
 
         ch.Detached = true
@@ -242 +246 @@
                 lastID, err := net.user.msgStore.LastMsgID(net, nameCM, time.Now())
                 if err != nil {
-                        net.user.logger.Printf("failed to get last message ID for channel %q: %v", ch.Name, err)
+                        net.logger.Printf("failed to get last message ID for channel %q: %v", ch.Name, err)
                 }
                 ch.DetachedInternalMsgID = lastID
@@ -268 +272 @@
         }
 
-        net.user.logger.Printf("network %q: attaching channel %q", net.GetName(), ch.Name)
+        net.logger.Printf("attaching channel %q", ch.Name)
 
         detachedMsgID := ch.DetachedInternalMsgID
@@ -348 +352 @@
 
         if err := net.user.srv.db.StoreClientDeliveryReceipts(net.ID, clientName, receipts); err != nil {
-                net.user.logger.Printf("failed to store delivery receipts for user %q, client %q, network %q: %v", net.user.Username, clientName, net.GetName(), err)
+                net.logger.Printf("failed to store delivery receipts for client %q: %v", clientName, err)
         }
 }