diff --git a/app/logical/danbooru_logger.rb b/app/logical/danbooru_logger.rb index 01422f727..09f763e7e 100644 --- a/app/logical/danbooru_logger.rb +++ b/app/logical/danbooru_logger.rb @@ -24,7 +24,14 @@ class DanbooruLogger def self.add_session_attributes(request, session, user) request_params = request.parameters.with_indifferent_access.except(:controller, :action) session_params = session.to_h.with_indifferent_access.slice(:session_id, :started_at) - user_params = { id: user&.id, name: user&.name, level: user&.level_string, ip: request.remote_ip, safe_mode: CurrentUser.safe_mode? } + user_params = { + id: user&.id, + name: user&.name, + level: user&.level_string, + ip: request.remote_ip, + country: request.headers["CF-IPCountry"], + safe_mode: CurrentUser.safe_mode? + } add_attributes("request.params", request_params) add_attributes("session.params", session_params) diff --git a/test/unit/session_loader_test.rb b/test/unit/session_loader_test.rb index 075eca261..984ea6cf1 100644 --- a/test/unit/session_loader_test.rb +++ b/test/unit/session_loader_test.rb @@ -10,6 +10,7 @@ class SessionLoaderTest < ActiveSupport::TestCase @request.stubs(:cookie_jar).returns({}) @request.stubs(:parameters).returns({}) @request.stubs(:session).returns({}) + @request.stubs(:headers).returns({}) SessionLoader.any_instance.stubs(:initialize_session_cookies) end