capistrano-delayed-job 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3988871ad96962e800e848378bbe2b11f91c46d3
-  data.tar.gz: 4491bd852fd9e8b04003a99043b37b4449b51bfc
+  metadata.gz: 06dde9bb44beaf1417b123c95216e86a6c516a3d
+  data.tar.gz: 1e1ae251ea4a96c13001958968e315f83de2a9a0
 SHA512:
-  metadata.gz: d6d58f344323ae2856da668a81c9f7cd9bf6e85c4780bfb69711a37b37e7c6c4b0f07e39c226a7a4886874230fc3e28cbe1cb17e172bed6ed3011d8ee3278919
-  data.tar.gz: 656c4928a24e7c0e5564cd5088353cebe1b2523beca5e6ed88ef7d2f669fee8f3a8d11e91498a665814117502c77a14b2c98d20e5be9da056956c11b6748f8e8
+  metadata.gz: ef82795130be159b8bf387daf43e1e9ac1b13a2459858c629c111cde1bd45cbecf812572fddc78f5406aca1c445187c9d060d73f4f34e26ca176bf8ce2c56787
+  data.tar.gz: db18958fbce27f26f74aa58c6d738d8b1013f5808a0adb8863a4c75ee363bdfec76241a25e72017732563de3f8a59cc1dfc23e4f5c8b71d20e4a7fd6295cea94

data/README.md

@@ -74,6 +74,13 @@ The roles on which the DelayedJob should run.
 * `set :delayed_job_service, -> { "delayed_job_#{fetch(:application)}_#{fetch(:stage)}" }`<br/>
 The name of the service that DelayedJob uses.
 
+* `set :delayed_job_monit_enabled, false` <br/>
+Use monit to monitor DelayedJob processes. This is especially useful on roles with
+constrained memory. On these nodes, DelayedJob processes are regularly killed by the 
+OS. In order to use this setting, install monit on roles that run DelayedJob and
+start monit's httpd server. See (here)[http://mmonit.com/monit/documentation/monit.html#MONIT-HTTPD]
+for instructions.
+
 ### Template customization
 
 If you want to change default templates, you can generate them using

data/lib/capistrano/delayed_job/helpers.rb

@@ -4,10 +4,16 @@ module Capistrano
   module DelayedJob
     module Helpers
 
-      def bundle_delayed_job(*args)
-        bin_dir = %w{bin script}.find{|dir_name| Dir.exists?(dir_name)}
-        raise "No bin or script dir found in project" if bin_dir.nil?
-        SSHKit::Command.new(:bundle, :exec, "#{bin_dir}/delayed_job", args).to_command
+      def delayed_job_command(*args)
+        "cd #{current_path} && " <<
+            SSHKit::Command.new("HOME=/home/#{deploy_user}",
+                                "RAILS_ENV=#{fetch(:rails_env)}",
+                                :nice,
+                                '-n 15',
+                                :bundle,
+                                :exec,
+                                delayed_job_script_relative_path,
+                                args).to_command
       end
 
       def dj_template(template_name)
@@ -24,7 +30,7 @@ module Capistrano
       end
 
       def deploy_user
-        capture :id, '-un'
+        @deploy_user ||= capture(:id, '-un')
       end
 
       def sudo_upload!(from, to)
@@ -35,6 +41,16 @@ module Capistrano
         sudo :mv, tmp_file, to_dir
       end
 
+      def delayed_job_script_relative_path
+        "#{relative_bin_path}/delayed_job"
+      end
+
+      private
+      def relative_bin_path
+        bin_path = %w{bin script}.find { |dir_name| Dir.exists?(dir_name) }
+        raise "No bin or script dir found in project" if bin_path.nil?
+        bin_path
+      end
     end
   end
 end

data/lib/capistrano/delayed_job/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module DelayedJob
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/capistrano/dsl/delayed_job_paths.rb

@@ -6,6 +6,12 @@ module Capistrano
         "/etc/init.d/#{fetch(:delayed_job_service)}"
       end
 
+      # install the delayed_job monit configuration in the conf.d directory, where it will
+      # automaticaly be picked up by monit
+      def delayed_job_monitrc_file
+        "/etc/monit/conf.d/#{fetch(:delayed_job_service)}.monitrc"
+      end
+
       def current_path
         deploy_path.join('current')
       end

data/lib/capistrano/tasks/delayed_job.rake

@@ -8,6 +8,7 @@ namespace :load do
   task :defaults do
     set :delayed_job_workers, 1
     set :delayed_job_service, -> { "delayed_job_#{fetch(:application)}_#{fetch(:stage)}" }
+    set :delayed_job_monit_enabled, false
 
     set :delayed_job_server_roles, [:app]
   end
@@ -36,7 +37,22 @@ namespace :delayed_job do
     desc "#{command} delayed_job"
     task command do
       on roles fetch(:delayed_job_server_roles) do
-        sudo :service, "#{fetch(:delayed_job_service)} #{command}"
+        if fetch(:delayed_job_monit_enabled)
+          # monit is enabled, use it to restart the service
+          sudo :monit, '-g', 'delayed_job', command
+        else
+          # monit is disabled, use the standard init script
+          sudo :service, fetch(:delayed_job_service), command
+        end
+      end
+    end
+  end
+
+  namespace :monit do
+    task :setup do
+      on roles fetch(:delayed_job_server_roles) do
+        sudo_upload! dj_template('delayed_job.monitrc.erb'), delayed_job_monitrc_file
+        sudo :service, 'monit restart'
       end
     end
   end
@@ -49,4 +65,5 @@ end
 desc 'Server setup tasks'
 task :setup do
   invoke 'delayed_job:setup'
+  invoke 'delayed_job:monit:setup' if fetch(:delayed_job_monit_enabled)
 end

data/lib/generators/capistrano/delayed_job/templates/delayed_job.monitrc.erb

@@ -0,0 +1,14 @@
+# DelayedJob monit script generated by capistrano-delayed-job on <%= Time.now %>.
+# Based on: https://github.com/collectiveidea/delayed_job/blob/master/contrib/delayed_job_rails_4_multiple.monitrc
+#
+# The processes are grouped so that monit can act on them as a whole, e.g.
+#
+#   monit -g delayed_job restart
+
+<% (0..fetch(:delayed_job_workers) - 1).each do |worker_id| %>
+check process delayed_job_<%= worker_id %>
+  with pidfile <%= shared_path.join('tmp/pids') %>/delayed_job.<%= worker_id %>.pid
+  start program = "/bin/su - <%= deploy_user %> -c '<%= delayed_job_command %> start -i <%= worker_id %>'"
+  stop program = "/bin/su - <%= deploy_user %> -c '<%= delayed_job_command %> stop -i <%= worker_id %>'"
+  group delayed_job
+<% end %>

data/lib/generators/capistrano/delayed_job/templates/delayed_job_init.erb

@@ -11,18 +11,15 @@
 ### END INIT INFO
  
 N=/etc/init.d/delayed_job
-APP_ROOT=<%= current_path %>
 AS_USER=<%= fetch(:delayed_job_user) %>
 service="delayed_job"
 
-
- 
 set -e
 
 interact() {
     op="$1"
     echo "Invoking DelayedJob with command '$op'"
-    CMD="cd $APP_ROOT && HOME=/home/$AS_USER RAILS_ENV=<%= fetch(:rails_env) %> nice -n 15 <%= bundle_delayed_job("$op -n", fetch(:delayed_job_workers))%>"
+    CMD="<%= delayed_job_command("$op -n", fetch(:delayed_job_workers))%>"
 
     if [ "$(id -un)" = "$AS_USER" ]; then
         eval $CMD
@@ -45,4 +42,4 @@ case "$1" in
         ;;
 esac
  
-exit 0
+exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-delayed-job
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ruben Stranders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -92,6 +92,7 @@ files:
 - lib/capistrano/tasks/delayed_job.rake
 - lib/generators/capistrano/delayed_job/USAGE.md
 - lib/generators/capistrano/delayed_job/config_generator.rb
+- lib/generators/capistrano/delayed_job/templates/delayed_job.monitrc.erb
 - lib/generators/capistrano/delayed_job/templates/delayed_job_init.erb
 homepage: https://github.com/capistrano-plugins/capistrano-delayed-job
 licenses: []