sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add context to upstreamConn.runUntilRegistered

Browse Source
This commit is contained in:
Simon Ser 2022-02-08 16:37:31 +01:00
parent 66a83e6345
commit 375ac53f74
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upstream.go
View File

@ -1955,14 +1955,14 @@ func (uc *upstreamConn) ReadMessage() (*irc.Message, error) {
return msg, nil return msg, nil
} }
func (uc *upstreamConn) runUntilRegistered() error { func (uc *upstreamConn) runUntilRegistered(ctx context.Context) error {
for !uc.registered { for !uc.registered {
msg, err := uc.ReadMessage() msg, err := uc.ReadMessage()
if err != nil { if err != nil {
return fmt.Errorf("failed to read message: %v", err) return fmt.Errorf("failed to read message: %v", err)
} }
if err := uc.handleMessage(context.TODO(), msg); err != nil { if err := uc.handleMessage(ctx, msg); err != nil {
if _, ok := err.(registrationError); ok { if _, ok := err.(registrationError); ok {
return err return err
} else { } else {
@ -1977,7 +1977,7 @@ func (uc *upstreamConn) runUntilRegistered() error {
if err != nil { if err != nil {
uc.logger.Printf("failed to parse connect command %q: %v", command, err) uc.logger.Printf("failed to parse connect command %q: %v", command, err)
} else { } else {
uc.SendMessage(context.TODO(), m) uc.SendMessage(ctx, m)
} }
} }

2
user.go
View File

@ -221,7 +221,7 @@ func (net *network) run() {
} }
uc.register() uc.register()
if err := uc.runUntilRegistered(); err != nil { if err := uc.runUntilRegistered(context.TODO()); err != nil {
text := err.Error() text := err.Error()
temp := true temp := true
if regErr, ok := err.(registrationError); ok { if regErr, ok := err.(registrationError); ok {