Use rails instead of rake to start queue runners

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 513cee8036f76c0c6adf61474fbfff089a75b26a..d623d05ff2bec465ad74a4a54df8e4c77a0a67ef 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -222,7 +222,7 @@ if node[:postgresql][:clusters][:"14/main"]
     type "simple"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     type "simple"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"

-    exec_start "#{node[:ruby][:bundle]} exec rake jobs:work"
+    exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"

     restart "on-failure"
     private_tmp true
     private_devices true
     restart "on-failure"
     private_tmp true
     private_devices true

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 50758caeac2cff7ecb88bc720cbcab8d899a96dc..672da6bada454ffca3331ade5642c1a6b6e4f16b 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -155,7 +155,7 @@ systemd_service "rails-jobs@" do
   environment "RAILS_ENV" => "production", "QUEUE" => "%I"
   user "rails"
   working_directory rails_directory
   environment "RAILS_ENV" => "production", "QUEUE" => "%I"
   user "rails"
   working_directory rails_directory

-  exec_start "#{node[:ruby][:bundle]} exec rake jobs:work"
+  exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"

   restart "on-failure"
   private_tmp true
   private_devices true
   restart "on-failure"
   private_tmp true
   private_devices true