diff options
| author | Shulhan <ms@kilabit.info> | 2019-01-29 05:32:14 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2019-01-29 21:35:08 +0700 |
| commit | 026b1d5e0bf58af70401bb49e627f998706d8a2b (patch) | |
| tree | 9340c424e7afe41cf733da48069328c46678fe51 | |
| parent | 188b48d6d5330559b2ef3e09d32be425a37fb36a (diff) | |
| download | pakakeh.go-026b1d5e0bf58af70401bb49e627f998706d8a2b.tar.xz | |
lib/smtp: fix error message with first-letter capital or end with newline
| -rw-r--r-- | lib/smtp/client.go | 12 | ||||
| -rw-r--r-- | lib/smtp/client_test.go | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/smtp/client.go b/lib/smtp/client.go index 694ba35c..15bfed1e 100644 --- a/lib/smtp/client.go +++ b/lib/smtp/client.go @@ -48,7 +48,7 @@ func NewClient(raddr string) (cl *Client, err error) { return nil, err } if ip == nil { - err = fmt.Errorf("NewClient: '%s' does not have MX record or IP address", raddr) + err = fmt.Errorf("client.NewClient: '%s' does not have MX record or IP address", raddr) return nil, err } @@ -80,7 +80,7 @@ func (cl *Client) Authenticate(mech Mechanism, username, password string) ( initialResponse := base64.StdEncoding.EncodeToString(b) cmd = []byte("AUTH PLAIN " + initialResponse + "\r\n") default: - return nil, fmt.Errorf("Authenticate: unknown mechanism") + return nil, fmt.Errorf("client.Authenticate: unknown mechanism") } return cl.SendCommand(cmd) @@ -212,7 +212,7 @@ func (cl *Client) MailTx(mail *MailTx) (res *Response, err error) { res, err = cl.SendCommand(cl.buf.Bytes()) if err != nil || res.Code != StatusOK { - err = fmt.Errorf("SendMailTx: MAIL FROM: %d - %s\n", res.Code, res.Message) + err = fmt.Errorf("client.MailTx: MAIL FROM: %d - %s", res.Code, res.Message) return res, err } @@ -222,7 +222,7 @@ func (cl *Client) MailTx(mail *MailTx) (res *Response, err error) { res, err = cl.SendCommand(cl.buf.Bytes()) if err != nil || res.Code != StatusOK { - err = fmt.Errorf("SendMailTx: RCPT TO: %d - %s\n", res.Code, res.Message) + err = fmt.Errorf("client.MailTx: RCPT TO: %d - %s", res.Code, res.Message) return res, err } } @@ -232,7 +232,7 @@ func (cl *Client) MailTx(mail *MailTx) (res *Response, err error) { res, err = cl.SendCommand(cl.buf.Bytes()) if err != nil || res.Code != StatusDataReady { - err = fmt.Errorf("SendMailTx: DATA: %d - %s\n", res.Code, res.Message) + err = fmt.Errorf("client.MailTx: DATA: %d - %s", res.Code, res.Message) return res, err } @@ -247,7 +247,7 @@ func (cl *Client) MailTx(mail *MailTx) (res *Response, err error) { res, err = cl.recv() if err != nil || res.Code != StatusOK { - err = fmt.Errorf("SendMailTx: Message: %d - %s\n", res.Code, res.Message) + err = fmt.Errorf("client.MailTx: Message: %d - %s", res.Code, res.Message) } return res, err diff --git a/lib/smtp/client_test.go b/lib/smtp/client_test.go index 22e68633..e2970f7b 100644 --- a/lib/smtp/client_test.go +++ b/lib/smtp/client_test.go @@ -105,7 +105,7 @@ func TestAuth(t *testing.T) { desc: "With invalid mechanism", username: testUsername, password: testPassword, - expErr: "Authenticate: unknown mechanism", + expErr: "client.Authenticate: unknown mechanism", }, { desc: "With invalid credential", mech: MechanismPLAIN, |