magic_recipes_two 0.0.36 → 0.0.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWRiZWI3YTQ4Mjk0Yzc2NmMzMDFiODFmN2Q2MWMxYTQxZTU5MGQ4Ng==
+    ZjhiNTBmODMxYWY4YTA1ODI2OTkzY2NlZDQ1N2FiMjVjNzAwN2Q2Ng==
   data.tar.gz: !binary |-
-    MDcwMGEwYjE5OWYxZDVjZGQ3YmYzNWZhN2ViYTE5YjRjYThhMDE0OA==
+    YTk5YjhjOTM0YmFkMjNjZWI2ZTc4NzhkZGM1YzEzNzMwYjBjOTY5MQ==
 SHA512:
   metadata.gz: !binary |-
-    M2YwN2MxY2FiM2Q1NDhmZjlhZTRmYjc0MjE2MWExZWNkMTg3NjFjNjkzMWFm
-    NzZkMzcxNWJmMmZkYjMxZDhiMzQyYjRmZGExZTA5YWU0MWEwMDE2NGIzZTQ1
-    M2U2Y2I3NWY4N2RiODZkNWFkNDg0MGQxNzMzM2Y5MjE1ZjRiMGE=
+    OTdiNzdjNGIzNjBhZDNlYjAzMDlhZDUzNTQ2Y2NkMmE3NDk3MjdiMDlhNDZi
+    NDZkMzA1MTk0MTJiOGU5YTE2Y2JhYjhjZDkxZWEyNmZiMjIwMjE1ZGI3ZGE5
+    Y2Q0ZWE3MWI3YmJjYTY5YjlmNWQzOGExMTZlMjlhZjI1N2EwOGU=
   data.tar.gz: !binary |-
-    YzRiNzc0OWIyNDAzMzM3N2UyYzZhNDZhOWY3NGRhODViYzE0ZDIxMDU3ZmZl
-    NzRlZjI4MjEzZDQ4NmU2OTAzNTI3NDViYzkyZDJmMWFjYjlkY2YxNGYxOWUx
-    ODJmNTkwMWFhNWZlYjdiODk0NjIzMzE1YmY2ZDQzYTZlZjc5NjU=
+    YTBjNzEyMjg3ZjdjZTcyYzY0NzRmYWM5MTNkNDdjZTViY2QyN2YzYTdhNzg3
+    YmEyNzMwMzI5ZGM5Y2U5ZDI3YzVkZTFkZTM5OTRhYTM2MDZiZDJlMDA3Zjlm
+    NjM3MDYyOWQzMDg1YWU0ZGZmM2Q1NjVlZDhhOWFmY2I5YzA4Nzg=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.36"
+    VERSION = "0.0.37"
   end
 end

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

@@ -23,7 +23,8 @@ check process <%= sidekiq_service_name(idx) %>
   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
   group sidekiq-<%= fetch(:sidekiq_monit_group, fetch(:application)) %>-<%= fetch(:stage) %>
   if does not exist then alert
-  if totalmem is greater than <%= fetch( :monit_sidekiq_totalmem_mb, 300 ) %> MB for 2 cycles then restart
+  if totalmem > <%= fetch( :monit_sidekiq_totalmem_mb, 300 ).to_i * .80 %> 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
   # alert <%= fetch(:monit_mail_to) %> only on { pid }
   if 2 restarts within 3 cycles then alert

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

@@ -5,7 +5,9 @@
     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 %>' " 
     if does not exist then alert
-    if mem > <%= fetch( :monit_thin_totalmem_mb, 300 ) %> MB for 1 cycles then restart
+    if mem > <%= fetch( :monit_thin_totalmem_mb, 300 ).to_i * .80 %> MB then alert
+    if mem > <%= fetch( :monit_thin_totalmem_mb, 300 ) %> MB for 2 cycles then restart
+    if cpu > 50% then alert
     if cpu > 50% for 3 cycles then restart
     if 5 restarts within 5 cycles then timeout
     # alert <%= fetch(:monit_mail_to) %> only on { pid }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails