Fixes #23115 - session is used instead session_safe

theforeman · Apr 6, 2018 · e5e1523 · e5e1523
1 parent 7bf12c7
commit e5e1523
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/proxy_api/resource.rb b/lib/proxy_api/resource.rb
@@ -108,7 +108,7 @@ def with_logger
     end
 
     def request_id
-      ::Logging.mdc['session_safe'] || SecureRandom.hex(32)
+      ::Logging.mdc['session'] || SecureRandom.hex(32)
     end
 
     def ssl_auth_params

diff --git a/test/unit/proxy_api/resource_test.rb b/test/unit/proxy_api/resource_test.rb
@@ -11,10 +11,10 @@ class ProxyApiResourceTest < ActiveSupport::TestCase
 
   test "connect_params sets x_request_id to logger safe session ID" do
     begin
-      ::Logging.mdc['session_safe'] = 'test'
+      ::Logging.mdc['session'] = 'test'
       assert_equal 'test', ProxyAPI::Resource.new({}).send(:connect_params)[:headers][:x_request_id]
     ensure
-      ::Logging.mdc.delete('session_safe')
+      ::Logging.mdc.delete('session')
     end
   end