Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def check_maintenance_mode_is_enabled
end

def set_logging_attributes
CurrentLoggingAttributes.host = request.host
CurrentLoggingAttributes.request_host = request.host
CurrentLoggingAttributes.request_id = request.request_id
CurrentLoggingAttributes.session_id_hash = Digest::SHA256.hexdigest session.id.to_s if session.exists? && session.id.present?
CurrentLoggingAttributes.trace_id = request.env["HTTP_X_AMZN_TRACE_ID"].presence
Expand Down
2 changes: 1 addition & 1 deletion app/models/current_logging_attributes.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class CurrentLoggingAttributes < ActiveSupport::CurrentAttributes
attribute :host, :request_id, :session_id_hash, :trace_id, :user_ip,
attribute :request_host, :request_id, :session_id_hash, :trace_id, :user_ip,
:user_id, :user_email, :user_organisation_slug, :acting_as_user_id,
:acting_as_user_email, :acting_as_user_organisation_slug, :form_id,
:page_id
Expand Down
4 changes: 2 additions & 2 deletions spec/requests/application_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
expect(log_lines[0]["request_id"]).to eq(request_id)
end

it "includes the host on log lines" do
expect(log_lines[0]["host"]).to eq("www.example.com")
it "includes the request_host on log lines" do
expect(log_lines[0]["request_host"]).to eq("www.example.com")
end

it "includes the user_id on log lines" do
Expand Down