Fix some start up issues

blackcandy-org · Dec 19, 2023 · d2ba158 · d2ba158
1 parent c042fc9
commit d2ba158
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/app/models/concerns/global_setting_concern.rb b/app/models/concerns/global_setting_concern.rb
@@ -38,6 +38,7 @@ def has_setting(setting, type: :string, default: nil)
       end
 
       if type == :boolean
+        alias_method "#{setting}?", setting
         singleton_class.send(:alias_method, "#{setting}?", setting)
       end
     end

diff --git a/app/models/setting.rb b/app/models/setting.rb
@@ -14,8 +14,8 @@ class Setting < ApplicationRecord
   validates :transcode_bitrate, inclusion: {in: AVAILABLE_BITRATE_OPTIONS}, allow_nil: true
   validate :media_path_exist
 
-  after_update :sync_media, if: :saved_change_to_media_path?
   after_update :toggle_media_listener, if: :saved_change_to_enable_media_listener?
+  after_update_commit :sync_media, if: :saved_change_to_media_path?
 
   private
 

diff --git a/config/puma.rb b/config/puma.rb
@@ -27,8 +27,7 @@
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
 # process behavior so workers use less memory.
-#
-# preload_app!
+preload_app!
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
@@ -55,10 +54,6 @@
 end
 
 if BlackCandy::Config.embedded_sidekiq?
-  # Preloading the application is necessary to ensure
-  # the configuration in your initializer runs before
-  # the boot callback below.
-  preload_app!
   sidekiq = nil
 
   on_worker_boot do
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ def has_setting(setting, type: :string, default: nil) @@
           end
           if type == :boolean
+            alias_method "#{setting}?", setting
             singleton_class.send(:alias_method, "#{setting}?", setting)
           end
         end
@@ Expand Down @@