diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 007d1827..b1a4323f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,11 +10,8 @@ class ApplicationController < ActionController::Base rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized def current_user - ::NewRelic::Agent.add_custom_parameters({ external_user_id: :session[:external_user_id], session_user_id: session[:user_id] }) + ::NewRelic::Agent.add_custom_parameters({ external_user_id: session[:external_user_id], session_user_id: session[:user_id] }) @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources - if @current_user == false - @current_user = nil - end end def help diff --git a/config/docker.yml.erb b/config/docker.yml.erb index 1c38c5d6..cf38ac79 100644 --- a/config/docker.yml.erb +++ b/config/docker.yml.erb @@ -6,7 +6,7 @@ default: &default development: <<: *default - host: tcp://192.168.23.75:2375 + host: tcp://192.168.59.104:2376 workspace_root: <%= File.join('/', 'shared', Rails.env) %> production: @@ -23,5 +23,5 @@ production: test: <<: *default - host: tcp://192.168.23.75:2375 + host: tcp://192.168.59.104:2376 workspace_root: <%= File.join('/', 'shared', Rails.env) %>