From ac74066f0e4f3d62f2d4645c3fa34b88c13958d1 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 19 Sep 2017 18:31:35 -0500 Subject: remove einterface gets (#7455) --- app/login.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'app/login.go') diff --git a/app/login.go b/app/login.go index ad2412644..18b26c55c 100644 --- a/app/login.go +++ b/app/login.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/einterfaces" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" "github.com/mssola/user_agent" @@ -27,15 +26,15 @@ func (a *App) AuthenticateUserForLogin(id, loginId, password, mfaToken, deviceId if len(id) != 0 { if user, err = a.GetUser(id); err != nil { err.StatusCode = http.StatusBadRequest - if einterfaces.GetMetricsInterface() != nil { - einterfaces.GetMetricsInterface().IncrementLoginFail() + if a.Metrics != nil { + a.Metrics.IncrementLoginFail() } return nil, err } } else { if user, err = a.GetUserForLogin(loginId, ldapOnly); err != nil { - if einterfaces.GetMetricsInterface() != nil { - einterfaces.GetMetricsInterface().IncrementLoginFail() + if a.Metrics != nil { + a.Metrics.IncrementLoginFail() } return nil, err } @@ -43,14 +42,14 @@ func (a *App) AuthenticateUserForLogin(id, loginId, password, mfaToken, deviceId // and then authenticate them if user, err = a.authenticateUser(user, password, mfaToken); err != nil { - if einterfaces.GetMetricsInterface() != nil { - einterfaces.GetMetricsInterface().IncrementLoginFail() + if a.Metrics != nil { + a.Metrics.IncrementLoginFail() } return nil, err } - if einterfaces.GetMetricsInterface() != nil { - einterfaces.GetMetricsInterface().IncrementLogin() + if a.Metrics != nil { + a.Metrics.IncrementLogin() } return user, nil -- cgit v1.2.3-1-g7c22