Fix type in unused constant name (#111)

* Write LDAP, SMTP, PAM, DLDAP back to all uppercase

* Fix type in unused constant name

* Other MixCased fixes

* Complete MixerCasing of template constants

* Re uppercase LTS and LDAPS suffixes

* Uppercase JSON suffix in constant names

* Proper case LoginNoType

* Prefix unexported template path constants with "tpl"

2 files changed, 12 insertions, 12 deletions

diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go
index 361ca5817f..116feecc8b 100644
--- a/modules/auth/ldap/ldap.go
+++ b/modules/auth/ldap/ldap.go
@@ -21,8 +21,8 @@ type SecurityProtocol int
 // Note: new type must be added at the end of list to maintain compatibility.
 const (
 	SecurityProtocolUnencrypted SecurityProtocol = iota
-	SecurityProtocolLdaps
-	SecurityProtocolStartTls
+	SecurityProtocolLDAPS
+	SecurityProtocolStartTLS
 )
 
 // Basic LDAP authentication service
@@ -118,7 +118,7 @@ func dial(ls *Source) (*ldap.Conn, error) {
 		ServerName:         ls.Host,
 		InsecureSkipVerify: ls.SkipVerify,
 	}
-	if ls.SecurityProtocol == SecurityProtocolLdaps {
+	if ls.SecurityProtocol == SecurityProtocolLDAPS {
 		return ldap.DialTLS("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port), tlsCfg)
 	}
 
@@ -127,7 +127,7 @@ func dial(ls *Source) (*ldap.Conn, error) {
 		return nil, fmt.Errorf("Dial: %v", err)
 	}
 
-	if ls.SecurityProtocol == SecurityProtocolStartTls {
+	if ls.SecurityProtocol == SecurityProtocolStartTLS {
 		if err = conn.StartTLS(tlsCfg); err != nil {
 			conn.Close()
 			return nil, fmt.Errorf("StartTLS: %v", err)
diff --git a/modules/log/smtp.go b/modules/log/smtp.go
index 0a10e56a63..0c87f0c704 100644
--- a/modules/log/smtp.go
+++ b/modules/log/smtp.go
@@ -17,7 +17,7 @@ const (
 )
 
 // smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server.
-type SmtpWriter struct {
+type SMTPWriter struct {
 	Username           string   `json:"Username"`
 	Password           string   `json:"password"`
 	Host               string   `json:"Host"`
@@ -27,8 +27,8 @@ type SmtpWriter struct {
 }
 
 // create smtp writer.
-func NewSmtpWriter() LoggerInterface {
-	return &SmtpWriter{Level: TRACE}
+func NewSMTPWriter() LoggerInterface {
+	return &SMTPWriter{Level: TRACE}
 }
 
 // init smtp writer with json config.
@@ -41,13 +41,13 @@ func NewSmtpWriter() LoggerInterface {
 //		"sendTos":["email1","email2"],
 //		"level":LevelError
 //	}
-func (sw *SmtpWriter) Init(jsonconfig string) error {
+func (sw *SMTPWriter) Init(jsonconfig string) error {
 	return json.Unmarshal([]byte(jsonconfig), sw)
 }
 
 // write message in smtp writer.
 // it will send an email with subject and only this message.
-func (s *SmtpWriter) WriteMsg(msg string, skip, level int) error {
+func (s *SMTPWriter) WriteMsg(msg string, skip, level int) error {
 	if level < s.Level {
 		return nil
 	}
@@ -76,12 +76,12 @@ func (s *SmtpWriter) WriteMsg(msg string, skip, level int) error {
 	)
 }
 
-func (_ *SmtpWriter) Flush() {
+func (_ *SMTPWriter) Flush() {
 }
 
-func (_ *SmtpWriter) Destroy() {
+func (_ *SMTPWriter) Destroy() {
 }
 
 func init() {
-	Register("smtp", NewSmtpWriter)
+	Register("smtp", NewSMTPWriter)
 }