From fe5655e6d5e486747ffc0479f68518ff8c82d8cd Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 3 Mar 2021 01:05:59 +0100 Subject: [PATCH] Add mandatory new parameter for remote_ip to Log.log --- app/controllers/users/my_sessions_controller.rb | 4 ++-- app/models/log.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/users/my_sessions_controller.rb b/app/controllers/users/my_sessions_controller.rb index f89f431..c78b34a 100644 --- a/app/controllers/users/my_sessions_controller.rb +++ b/app/controllers/users/my_sessions_controller.rb @@ -3,7 +3,7 @@ class Users::MySessionsController < Devise::SessionsController # Hook after successful login def after_login - Log.log "User #{current_user} logged in." + Log.log "User #{current_user.email} logged in.", @remote_ip old_screenshots = session[:uploaded_screenshots] if old_screenshots.to_a.length > 0 old_screenshots.each do |id| @@ -14,7 +14,7 @@ class Users::MySessionsController < Devise::SessionsController end # The message is probably confusing. Just add the screenshots. # flash[:info] = "#{old_screenshots.to_a.length} uploads have been added to your account" - Log.log "Anonymously uploaded screenshots #{old_screenshots} added to #{current_user}." + Log.log "Anonymously uploaded screenshots #{old_screenshots} added to #{current_user.email}.", @remote_ip session[:uploaded_screenshots] = nil end end diff --git a/app/models/log.rb b/app/models/log.rb index c8247c8..7a05c40 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -4,16 +4,16 @@ class Log < ApplicationRecord validates :message, presence: true validates :section, presence: true - validates :section, inclusion: { in: ['importer', 'upload', 'frontend'] } + #validates :section, inclusion: { in: ['importer', 'upload', 'frontend'] } validates :level, presence: true - validates :level, inclusion: { in: ['info', 'error'] } + #validates :level, inclusion: { in: ['info', 'error'] } default_scope { order('id DESC') } - def self.log(message, section='frontend', level='info') + def self.log(message, ip_address, section='frontend', level='info') log = Log.new ip_address = request.remote_ip if defined? request