handlers/email: More precise name, fix data race possibility

Author: Madouura

handlers/email/email.go

@@ -35,6 +35,7 @@ const (
 
 // Email is an instance of the email logger
 type Email struct {
+	enabled         bool
 	formatter       Formatter
 	formatFunc      FormatFunc
 	timestampFormat string
@@ -45,22 +46,21 @@ type Email struct {
 	password        string
 	from            string
 	to              []string
-	send            bool
 	rw              sync.RWMutex
 	once            sync.Once
 }
 
 // New returns a new instance of the email logger
 func New(host string, port int, username string, password string, from string, to []string) *Email {
 	e := &Email{
+		enabled:         true,
 		timestampFormat: log.DefaultTimeFormat,
 		host:            host,
 		port:            port,
 		username:        username,
 		password:        password,
 		from:            from,
 		to:              to,
-		send:            true,
 		formatFunc:      defaultFormatFunc,
 	}
 	e.SetTemplate(defaultTemplate)
@@ -130,12 +130,12 @@ func (email *Email) SetEmailConfig(host string, port int, username string, passw
 	email.formatter = email.formatFunc(email)
 }
 
-// SetSend enables or disables the email handler sending emails
-func (email *Email) SetSend(send bool) {
+// SetEnabled enables or disables the email handler sending emails
+func (email *Email) SetEnabled(enabled bool) {
 	email.rw.Lock()
 	defer email.rw.Unlock()
 
-	email.send = send
+	email.enabled = enabled
 }
 
 func defaultFormatFunc(email *Email) Formatter {
@@ -165,12 +165,18 @@ func defaultFormatFunc(email *Email) Formatter {
 
 // Log handles the log entry
 func (email *Email) Log(e log.Entry) {
-	if !email.send {
+	email.rw.RLock()
+
+	if !email.enabled {
 		return
 	}
+
+	email.rw.RUnlock()
+
 	email.once.Do(func() {
 		email.formatter = email.formatFunc(email)
 	})
+
 	var s gomail.SendCloser
 	var err error
 	var open bool

handlers/email/email_test.go

@@ -104,7 +104,7 @@ func TestEmailHandler(t *testing.T) {
 	email.SetTimestampFormat("MST")
 	email.SetTemplate(defaultTemplate)
 	email.SetEmailConfig("localhost", 3041, "", "", "[email protected]", []string{"[email protected]"})
-	email.SetSend(true)
+	email.SetEnabled(true)
 	// email.SetFormatFunc(testFormatFunc)
 	log.AddHandler(email, log.InfoLevel, log.DebugLevel)
 
@@ -175,7 +175,6 @@ func TestBadEmailTemplate(t *testing.T) {
 }
 
 func TestBadSend(t *testing.T) {
-
 	email := New("localhost", 3041, "", "", "[email protected]", []string{"[email protected]"})
 	log.AddHandler(email, log.InfoLevel)