Changeset 399 in code for trunk

Timestamp:

Aug 19, 2020, 9:35:12 PM (5 years ago)

Author:

contact

Message:

Improve registration error messages

• Don't print the raw IRC message, since we already show the original error message
• Avoid double-printing "registration failed"

Location:

trunk

Files:

• upstream.go (modified) (3 diffs)
• user.go (modified) (1 diff)

trunk/upstream.go

@@ -31 +31 @@
         "multi-prefix":     true,
         "server-time":      true,
+}
+
+type registrationError string
+
+func (err registrationError) Error() string {
+        return fmt.Sprintf("registration error: %v", string(err))
 }
 
@@ -1358 +1364 @@
         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 {
-                        return fmt.Errorf("registration failed: %v", msg.Params[len(msg.Params)-1])
+                        text := msg.Params[len(msg.Params)-1]
+                        return registrationError(text)
                 }
                 fallthrough
@@ -1527 +1534 @@
 
                 if err := uc.handleMessage(msg); err != nil {
-                        msg.Tags = nil // prevent message tags from cluttering logs
-                        return fmt.Errorf("failed to handle message %q: %v", msg, err)
+                        if _, ok := err.(registrationError); ok {
+                                return err
+                        } else {
+                                msg.Tags = nil // prevent message tags from cluttering logs
+                                return fmt.Errorf("failed to handle message %q: %v", msg, err)
+                        }
                 }
         }

trunk/user.go

@@ -141 +141 @@
                 uc.register()
                 if err := uc.runUntilRegistered(); err != nil {
-                        uc.logger.Printf("failed to register: %v", err)
-                        net.user.events <- eventUpstreamConnectionError{net, fmt.Errorf("failed to register: %v", err)}
+                        text := err.Error()
+                        if regErr, ok := err.(registrationError); ok {
+                                text = string(regErr)
+                        }
+                        uc.logger.Printf("failed to register: %v", text)
+                        net.user.events <- eventUpstreamConnectionError{net, fmt.Errorf("failed to register: %v", text)}
                         uc.Close()
                         continue