magic_recipes_two 0.0.74 → 0.0.75

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU4YzQxY2MxNDhiNjBjOTM1MWIzYjhjYTc3YTdlMzc3M2Q2NGE3OQ==
+    OTE5YTljNzFlNTM1ZjBmY2VjOGQyMmYyNmMxMmExZmE1MDdhNjBmZg==
   data.tar.gz: !binary |-
-    NTBkN2ZkNmNlMTI5YjUxN2M5NTdhZjE5MWI0ODA5MTU2Yjk5NTE0OA==
+    YmFhMDM4NThhMTEyNTgwY2FmMDkyYjA5MDFlNDM0YjczYWYxZTQxZg==
 SHA512:
   metadata.gz: !binary |-
-    MDkxZjY3ZThmZjcyODgxOTMxNDJmMmIxZjU2NmMyMGU3NDg0OTM5ZTMyYmY4
-    MGZmYzBjMTcwZjQwZjJiYTBlNWZlZTIzZGI4MjQ2Mjc0NjgxMjBmZmI1MWQ3
-    ZGFlOTQ0YTM1YWM3OTRiNjY3YzRmYTVmMTEyYTgyNDI4ZjY2MjY=
+    OWFjMGVkOTBiZWEyYmM1NmY3MmMzNTYyYzIxOGY2NzEzOGQyZDQyYjI1NWU5
+    YjY1Mzk5Yjk5ODMyN2YwMzQ1ZDhiNDMzNGEzMjg2NjExZjM2M2YxZWI5ZjUz
+    OGJmYzg4MDEyZjU2OWYzMTljMTI5Nzk5MDgyMDViYjg0MmJkMWY=
   data.tar.gz: !binary |-
-    NThlODY3MDRiMzZhYWFlNGEwZjE5MjhmYmE3M2QwYWExNTA0MTQyZmU4Y2Zh
-    ZGQ4NzY0NDJhNDM5YTc1ZmJhNTA2NGI3MDY1OTA4ZTczODA5YmMzY2U3M2I1
-    NTZkMjZlMmRhZmQwYTBiZDA4ZWIyYWQyZDFlMGNkYzhkM2ZlYjg=
+    ZTE3NDI1YTEyZWFjYjJlYzgxNDMyNDU5NGE0M2ZhNjQzZWEzMTkzM2E5ZTRl
+    MzA3OTMzNzgxZDQ2MGFiNGFmZjk1NzQ2YTViMzdiMmZjZDA3MzEzOTdjZDhk
+    YjYwNzYwNzczMzIzNjk4NGEwZWJkMTUzYThmM2Y0Nzc5ZWE0NDc=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.74"
+    VERSION = "0.0.75"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -28,12 +28,12 @@ namespace :load do
     set :postgresql_roles,            -> { :db }
     set :postgresql_pid,              -> { "/var/run/postgresql/9.1-main.pid" }
     ## Additional stuff for thin (need secrets_key_base to be set)
-    set :monit_thin_with_secret,      -> { false }
     set :monit_thin_totalmem_mb,      -> { 300 }
     ## Additional stuff for sidekiq (need secrets_key_base to be set)
-    set :monit_sidekiq_with_secret,   -> { false }
     set :monit_sidekiq_totalmem_mb,   -> { 300 }
     set :monit_sidekiq_timeout_sec,   -> { 90 }
+    ## Additional App helpers
+    set :monit_app_worker_command,    -> { "cd #{ current_path } ; #{fetch(:rvm_path)}/bin/rvm #{fetch(:rvm_ruby_version)} do bundle exec MONIT_CMD" }
     ## WebClient
     set :monit_http_client,           -> { true }
     set :monit_http_domain,           -> { false }
@@ -168,6 +168,10 @@ def monit_config( name, destination = nil, role = nil )
   execute :sudo, "chmod 600 #{destination}"
 end
 
+def monit_app_prefixed( cmd )
+  fetch(:monit_app_worker_command, "cd #{ current_path } ; bundle exec MONIT_CMD").to_s.gsub(/MONIT_CMD/, cmd)
+end
+
 
 namespace :deploy do
   before :starting, :stop_monitoring do

data/lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb

@@ -27,16 +27,16 @@
 %>
 check process <%= sidekiq_service_name(idx) %>
   with pidfile "<%= pid_file %>"
-  start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ;<% if fetch(:monit_sidekiq_with_secret) %> export SECRET_KEY_BASE=<%= fetch(:secrets_key_base) %>; export <%= fetch(:secrets_key_name) %>=<%= fetch(:secrets_key_base) %>;<% end %> bundle exec sidekiq <%= args.join(" ") %>'" with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
-  stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiqctl stop <%= pid_file %>' " with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
+  start program = <%=   monit_app_prefixed("sidekiq #{ args.join(" ") }")     %> with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
+  stop program = <%=    monit_app_prefixed("sidekiqctl stop #{ pid_file }")   %> with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
   group sidekiq-<%= fetch(:sidekiq_monit_group, fetch(:application)) %>-<%= fetch(:stage) %>
   # if does not exist then start # (default)
-  # if does not exist for 3 cycles then alert
-  if 3 restarts within 5 cycles then alert
   if totalmem > <%= ( fetch( :monit_sidekiq_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then alert
   if totalmem > <%= fetch( :monit_sidekiq_totalmem_mb, 300 ) %> MB for 2 cycles then restart
-  if 3 restarts within 5 cycles then timeout
+  # if does not exist for 3 cycles then alert
   # alert <%= fetch(:monit_mail_to) %> only on { pid }
+  if 3 restarts within 5 cycles then alert
+  if 3 restarts within 5 cycles then timeout
   if 2 restarts within 3 cycles then alert
   if changed pid 2 times within 10 cycles then alert
 <% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/thin.erb

@@ -2,8 +2,8 @@
 <%  fetch(:app_instances, 1).times do |n| %>
   check process <%= fetch(:application) %>_<%= fetch(:stage) %>_thin_<%= n %> with pidfile <%= deploy_to %>/shared/pids/thin_<%= fetch(:application) %>_<%= fetch(:stage) %>.<%= n %>.pid
     group thin-<%= fetch(:application) %>-<%= fetch(:stage) %>
-    start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ;<% if fetch(:monit_thin_with_secret) %> export SECRET_KEY_BASE=<%= fetch(:secrets_key_base) %>; export <%= fetch(:secrets_key_name) %>=<%= fetch(:secrets_key_base) %>;<% end %> bundle exec thin start -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' "
-    stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec thin stop -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' " 
+    start program = <%=   monit_app_prefixed("thin start -C config/thin_app_#{ fetch(:stage) }.yml -o #{ n }")    %>
+    stop program = <%=    monit_app_prefixed("thin stop -C config/thin_app_#{ fetch(:stage) }.yml -o #{ n }")     %>
     # if does not exist then start # (default)
     # if does not exist for 3 cycles then alert
     if 3 restarts within 5 cycles then alert

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.74
+  version: 0.0.75
 platform: ruby
 authors:
 - Torsten Wetzel