Changeset 179 in code for trunk/user.go

Timestamp:

Mar 27, 2020, 11:51:58 PM (5 years ago)

Author:

contact

Message:

Introduce eventUpstreamDisconnected

This allows us to perform cleanup actions in the user goroutine. This
removes the need for pendingLISTsLock.

File:

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

trunk/user.go

@@ -13 +13 @@
         msg *irc.Message
         uc  *upstreamConn
+}
+
+type eventUpstreamDisconnected struct {
+        uc *upstreamConn
 }
 
@@ -76 +80 @@
                 }
                 uc.Close()
+                net.user.events <- eventUpstreamDisconnected{uc}
 
                 net.lock.Lock()
@@ -99 +104 @@
 
         // LIST commands in progress
-        pendingLISTsLock sync.Mutex
-        pendingLISTs     []pendingLIST
+        pendingLISTs []pendingLIST
 }
 
@@ -164 +168 @@
         for e := range u.events {
                 switch e := e.(type) {
+                case eventUpstreamDisconnected:
+                        uc := e.uc
+                        for _, log := range uc.logs {
+                                log.file.Close()
+                        }
+                        uc.endPendingLists(true)
                 case eventUpstreamMessage:
                         msg, uc := e.msg, e.uc