Changeset 736 in code for trunk

Timestamp:

Dec 2, 2021, 4:33:11 PM (4 years ago)

Author:

contact

Message:

Don't retry connecting on permanent failure

Closes: ​https://todo.sr.ht/~emersion/soju/164

Location:

trunk

Files:

• upstream.go (modified) (2 diffs)
• user.go (modified) (2 diffs)

trunk/upstream.go

@@ -40 +40 @@
 }
 
-type registrationError string
+type registrationError struct {
+        *irc.Message
+}
 
 func (err registrationError) Error() string {
-        return fmt.Sprintf("registration error: %v", string(err))
+        return fmt.Sprintf("registration error (%v): %v", err.Command, err.Reason())
+}
+
+func (err registrationError) Reason() string {
+        if len(err.Params) > 0 {
+                return err.Params[len(err.Params)-1]
+        }
+        return err.Command
+}
+
+func (err registrationError) Temporary() bool {
+        // Only return false if we're 100% sure that fixing the error requires a
+        // network configuration change
+        return err.Command != irc.ERR_PASSWDMISMATCH && err.Command != irc.ERR_ERRONEUSNICKNAME
 }
 
@@ -1652 +1667 @@
         case irc.ERR_PASSWDMISMATCH, irc.ERR_ERRONEUSNICKNAME, irc.ERR_NICKNAMEINUSE, irc.ERR_NICKCOLLISION, irc.ERR_UNAVAILRESOURCE, irc.ERR_NOPERMFORHOST, irc.ERR_YOUREBANNEDCREEP:
                 if !uc.registered {
-                        text := msg.Params[len(msg.Params)-1]
-                        return registrationError(text)
+                        return registrationError{msg}
                 }
                 fallthrough

trunk/user.go

@@ -222 +222 @@
                 if err := uc.runUntilRegistered(); err != nil {
                         text := err.Error()
+                        temp := true
                         if regErr, ok := err.(registrationError); ok {
-                                text = string(regErr)
+                                text = regErr.Reason()
+                                temp = regErr.Temporary()
                         }
                         uc.logger.Printf("failed to register: %v", text)
@@ -230 +232 @@
                         net.user.srv.metrics.upstreams.Add(-1)
                         net.user.srv.metrics.upstreamConnectErrorsTotal.Inc()
+                        if !temp {
+                                return
+                        }
                         continue
                 }