Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-23 15:37:01 +00:00
Code Releases Activity

Improve debugging and tracing information

Browse Source 
This patch reviews various debug and informational messages, making more
uniform use of tracing, and extends the monitoring http server with
useful information like an index and a queue dump.
This commit is contained in:
Alberto Bertogli
2016-10-08 01:27:13 +01:00
parent 2b801a84d1
commit 3e6dd12d06
5 changed files with 178 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/courier/smtp.go
View File

@@ -34,9 +34,9 @@ type SMTP struct {
}
func (s *SMTP) Deliver(from string, to string, data []byte) (error, bool) {
tr := trace.New("SMTP", "Deliver")
tr := trace.New("SMTP.Courier", to)
defer tr.Finish()
tr.LazyPrintf("%s -> %s", from, to)
tr.Debugf("%s -> %s", from, to)
mx, err := lookupMX(envelope.DomainOf(to))
if err != nil {
@@ -46,7 +46,7 @@ func (s *SMTP) Deliver(from string, to string, data []byte) (error, bool) {
// have to make sure we try hard enough on the lookup above.
return tr.Errorf("Could not find mail server: %v", err), true
}
tr.LazyPrintf("MX: %s", mx)
tr.Debugf("MX: %s", mx)
// Do we use insecure TLS?
// Set as fallback when retrying.
@@ -94,17 +94,17 @@ retry:
}
insecure = true
tr.LazyPrintf("TLS error, retrying insecurely")
tr.Debugf("TLS error, retrying insecurely")
goto retry
}
if config.InsecureSkipVerify {
tr.LazyPrintf("Insecure - self-signed certificate")
tr.Debugf("Insecure - using TLS, but cert does not match %s", mx)
} else {
tr.LazyPrintf("Secure - using TLS")
tr.Debugf("Secure - using TLS")
}
} else {
tr.LazyPrintf("Insecure - not using TLS")
tr.Debugf("Insecure - NOT using TLS")
}
// c.Mail will add the <> for us when the address is empty.
@@ -130,6 +130,7 @@ retry:
}
c.Quit()
tr.Debugf("done")
return nil, false
}