From 2d3ecbe5b2aabe33ae0086dc7ecc79bc0269dc35 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 19 Dec 2015 02:44:34 -0500 Subject: [PATCH] make mailer log more verbose --- gogs.go | 2 +- modules/mailer/mailer.go | 18 +++++++++--------- templates/.VERSION | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gogs.go b/gogs.go index 5afeb0764c..4fcb216ba7 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.10.1217" +const APP_VER = "0.8.10.1219" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 4dbcf1180b..eafe04680a 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -111,7 +111,7 @@ func (s *Sender) Send(from string, to []string, msg io.WriterTo) error { client, err := smtp.NewClient(conn, host) if err != nil { - return err + return fmt.Errorf("NewClient: %v", err) } if !setting.MailService.DisableHelo { @@ -124,7 +124,7 @@ func (s *Sender) Send(from string, to []string, msg io.WriterTo) error { } if err = client.Hello(hostname); err != nil { - return err + return fmt.Errorf("Hello: %v", err) } } @@ -132,7 +132,7 @@ func (s *Sender) Send(from string, to []string, msg io.WriterTo) error { hasStartTLS, _ := client.Extension("STARTTLS") if !isSecureConn && hasStartTLS { if err = client.StartTLS(tlsconfig); err != nil { - return err + return fmt.Errorf("StartTLS: %v", err) } } @@ -151,28 +151,28 @@ func (s *Sender) Send(from string, to []string, msg io.WriterTo) error { if auth != nil { if err = client.Auth(auth); err != nil { - return err + return fmt.Errorf("Auth: %v", err) } } } if err = client.Mail(from); err != nil { - return err + return fmt.Errorf("Mail: %v", err) } for _, rec := range to { if err = client.Rcpt(rec); err != nil { - return err + return fmt.Errorf("Rcpt: %v", err) } } w, err := client.Data() if err != nil { - return err + return fmt.Errorf("Data: %v", err) } else if _, err = msg.WriteTo(w); err != nil { - return err + return fmt.Errorf("WriteTo: %v", err) } else if err = w.Close(); err != nil { - return err + return fmt.Errorf("Close: %v", err) } return client.Quit() diff --git a/templates/.VERSION b/templates/.VERSION index 09f9acef26..839efa3750 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.10.1217 \ No newline at end of file +0.8.10.1219 \ No newline at end of file