thread safe time zone

lazaronixon · Jul 15, 2023 · 5eed0c8 · 5eed0c8
1 parent a7d538a
commit 5eed0c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/generators/admin/install/templates/controllers/admin/base_controller.rb b/lib/generators/admin/install/templates/controllers/admin/base_controller.rb
@@ -1,12 +1,12 @@
 class Admin::BaseController < ActionController::Base
   include Pagy::Backend
 
-  before_action :set_time_zone
+  around_action :set_time_zone
   before_action :authenticate
 
   private
     def set_time_zone
-      Time.zone = cookies[:time_zone]
+      Time.use_zone(cookies[:time_zone]) { yield }
     end
 
     def authenticate

diff --git a/lib/generators/admin/install/templates/models/admin/current.rb b/lib/generators/admin/install/templates/models/admin/current.rb
@@ -1,3 +1,3 @@
 class Admin::Current < ActiveSupport::CurrentAttributes
-  attribute :user; resets { Time.zone = nil }
+  attribute :user
 end