Run a job queue runner for each rails instance

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index a7cbc5f51a2f7da6d146a6076b370c5e0e04d02e..613305d21172cddd17e745bbb0bf8719e2df2c04 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -203,6 +203,22 @@ if node[:postgresql][:clusters][:"9.5/main"]
     mode 0o755
   end
 
     mode 0o755
   end
 

+  ruby_version = node[:passenger][:ruby_version]
+
+  systemd_service "rails-jobs@" do
+    description "Rails job queue runner"
+    type "simple"
+    user "apis"
+    working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
+    exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"
+    restart "on-failure"
+    private_tmp true
+    private_devices true
+    protect_system "full"
+    protect_home true
+    no_new_privileges true
+  end
+

   systemd_service "cgimap@" do
     description "OpenStreetMap API Server"
     type "forking"
   systemd_service "cgimap@" do
     description "OpenStreetMap API Server"
     type "forking"


@@ -258,7 +274,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
       end
 
       rails_port site_name do
       end
 
       rails_port site_name do

-        ruby node[:passenger][:ruby_version]
+        ruby ruby_version

         directory rails_directory
         user "apis"
         group "apis"
         directory rails_directory
         user "apis"
         group "apis"


@@ -282,6 +298,14 @@ if node[:postgresql][:clusters][:"9.5/main"]
         notifies :restart, "rails_port[#{site_name}]"
       end
 
         notifies :restart, "rails_port[#{site_name}]"
       end
 

+      service "rails-jobs@#{name}" do
+        action [:enable, :start]
+        supports :restart => true
+        subscribes :restart, "rails_port[#{site_name}]"
+        subscribes :restart, "systemd_service[#{name}]"
+        only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
+      end
+

       if details[:cgimap_repository]
         git cgimap_directory do
           action :sync
       if details[:cgimap_repository]
         git cgimap_directory do
           action :sync