diff options
| -rw-r--r-- | app/controllers/sessions_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index fc0c0024ad7..90bf6c51699 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -46,7 +46,9 @@ class SessionsController < Devise::SessionsController private def log_failed_login - Gitlab::AppLogger.info("Failed Login: username=#{user_params[:login]} ip=#{request.remote_ip}") if failed_login? + return unless failed_login? + + Gitlab::AppLogger.info("Failed Login: username=#{user_params[:login]} ip=#{request.remote_ip}") end def failed_login? diff --git a/app/models/user.rb b/app/models/user.rb index 195490c95c7..cbfd07d0098 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1063,7 +1063,7 @@ class User < ActiveRecord::Base # override, from Devise def lock_access! - Gitlab::AppLogger.info("Account Locked: username=#{username} reason=invalid_login_attempts") + Gitlab::AppLogger.info("Account Locked: username=#{username}") super end |