chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add mandatory new parameter for remote_ip to Log.log

Browse source
This commit is contained in:
Christoph Haas 2021-03-03 01:05:59 +01:00
parent 150bd5df3e
commit fe5655e6d5
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users/my_sessions_controller.rb
View file

@ -3,7 +3,7 @@ class Users::MySessionsController < Devise::SessionsController
# Hook after successful login # Hook after successful login
def after_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] old_screenshots = session[:uploaded_screenshots]
if old_screenshots.to_a.length > 0 if old_screenshots.to_a.length > 0
old_screenshots.each do |id| old_screenshots.each do |id|
@ -14,7 +14,7 @@ class Users::MySessionsController < Devise::SessionsController
end end
# The message is probably confusing. Just add the screenshots. # The message is probably confusing. Just add the screenshots.
# flash[:info] = "#{old_screenshots.to_a.length} uploads have been added to your account" # 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 session[:uploaded_screenshots] = nil
end end
end end

6
app/models/log.rb
View file

@ -4,16 +4,16 @@ class Log < ApplicationRecord
validates :message, presence: true validates :message, presence: true
validates :section, 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, presence: true
validates :level, inclusion: { in: ['info', 'error'] } #validates :level, inclusion: { in: ['info', 'error'] }
default_scope { default_scope {
order('id DESC') order('id DESC')
} }
def self.log(message, section='frontend', level='info') def self.log(message, ip_address, section='frontend', level='info')
log = Log.new log = Log.new
ip_address = request.remote_ip if defined? request ip_address = request.remote_ip if defined? request