Merge pull request #118 from hbin/master

Don't need establish connection block if `puma_preload_app' set to false
seuros · Aug 5, 2015 · 4a76e49 · 4a76e49
2 parents fc282b2 + 58ce7ad
commit 4a76e49
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/capistrano/templates/puma.rb.erb b/lib/capistrano/templates/puma.rb.erb
@@ -33,7 +33,7 @@ on_restart do
   ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
 end
 
-<% if fetch(:puma_init_active_record) %>
+<% if puma_preload_app? and fetch(:puma_init_active_record) %>
 on_worker_boot do
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Base.establish_connection