From e1931649e4ae21d2b251b1bc82972bd728de2d3c Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 3 Apr 2020 17:01:25 +0200 Subject: [PATCH] Use conn.ReadMessage instead of irc.Conn.ReadMessage --- downstream.go | 6 +----- upstream.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/downstream.go b/downstream.go index e948aee..8eec279 100644 --- a/downstream.go +++ b/downstream.go @@ -731,15 +731,11 @@ func (dc *downstreamConn) runNetwork(net *network, loadHistory bool) { func (dc *downstreamConn) runUntilRegistered() error { for !dc.registered { - msg, err := dc.irc.ReadMessage() + msg, err := dc.ReadMessage() if err != nil { return fmt.Errorf("failed to read IRC command: %v", err) } - if dc.srv.Debug { - dc.logger.Printf("received: %v", msg) - } - err = dc.handleMessage(msg) if ircErr, ok := err.(ircError); ok { ircErr.Message.Prefix = dc.srv.prefix() diff --git a/upstream.go b/upstream.go index 24d2173..000902c 100644 --- a/upstream.go +++ b/upstream.go @@ -1278,15 +1278,11 @@ func (uc *upstreamConn) register() { func (uc *upstreamConn) runUntilRegistered() error { for !uc.registered { - msg, err := uc.irc.ReadMessage() + msg, err := uc.ReadMessage() if err != nil { return fmt.Errorf("failed to read message: %v", err) } - if uc.srv.Debug { - uc.logger.Printf("received: %v", msg) - } - if err := uc.handleMessage(msg); err != nil { return fmt.Errorf("failed to handle message %q: %v", msg, err) }