Changeset 205 in code for trunk

Timestamp:

Apr 1, 2020, 2:27:53 PM (5 years ago)

Author:

contact

Message:

Set write deadlines

References: ​https://todo.sr.ht/~emersion/soju/26

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• server.go (modified) (1 diff)
• upstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -245 +245 @@
 
 func (dc *downstreamConn) writeMessages() error {
+        // TODO: any SendMessage call after the connection is closed will
+        // either block or drop
         for {
                 var err error
@@ -253 +255 @@
                                 dc.logger.Printf("sent: %v", msg)
                         }
+                        dc.net.SetWriteDeadline(time.Now().Add(writeTimeout))
                         err = dc.irc.WriteMessage(msg)
                 case <-dc.closed:

trunk/server.go

@@ -14 +14 @@
 var keepAlivePeriod = time.Minute
 var retryConnectMinDelay = time.Minute
+var writeTimeout = 10 * time.Second
 
 func setKeepAlive(c net.Conn) error {

trunk/upstream.go

@@ -112 +112 @@
 
         go func() {
+                // TODO: any SendMessage call after the connection is closed will
+                // either block or drop
                 for {
                         var closed bool
@@ -119 +121 @@
                                         uc.logger.Printf("sent: %v", msg)
                                 }
+                                uc.net.SetWriteDeadline(time.Now().Add(writeTimeout))
                                 if err := uc.irc.WriteMessage(msg); err != nil {
                                         uc.logger.Printf("failed to write message: %v", err)
+                                        closed = true
                                 }
                         case <-uc.closed: