magic_recipes_two 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cf4a74c8306964388150c3c4af548591600b410b
-  data.tar.gz: a20001f992eb0b8d0cb8196e64c93fb1ad843293
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWRiZWI3YTQ4Mjk0Yzc2NmMzMDFiODFmN2Q2MWMxYTQxZTU5MGQ4Ng==
+  data.tar.gz: !binary |-
+    MDcwMGEwYjE5OWYxZDVjZGQ3YmYzNWZhN2ViYTE5YjRjYThhMDE0OA==
 SHA512:
-  metadata.gz: bcab40a8738cda8b6b48e1be9dcb81134bc14232b0e4d3b5738914664f8975a74ad472ff76346cc6cce4c3616e660e37fa1b00e82ae9634b6437c7ec61f96129
-  data.tar.gz: 238e03c2827db7c99f69b088d6aed3e1b13fcf11b84af2cbeeaea6783c7259a8c57b800d555cd610f8ae7cc524d65f3f9f5f6aa32918a395d951fc4ee9d4d5e2
+  metadata.gz: !binary |-
+    M2YwN2MxY2FiM2Q1NDhmZjlhZTRmYjc0MjE2MWExZWNkMTg3NjFjNjkzMWFm
+    NzZkMzcxNWJmMmZkYjMxZDhiMzQyYjRmZGExZTA5YWU0MWEwMDE2NGIzZTQ1
+    M2U2Y2I3NWY4N2RiODZkNWFkNDg0MGQxNzMzM2Y5MjE1ZjRiMGE=
+  data.tar.gz: !binary |-
+    YzRiNzc0OWIyNDAzMzM3N2UyYzZhNDZhOWY3NGRhODViYzE0ZDIxMDU3ZmZl
+    NzRlZjI4MjEzZDQ4NmU2OTAzNTI3NDViYzkyZDJmMWFjYjlkY2YxNGYxOWUx
+    ODJmNTkwMWFhNWZlYjdiODk0NjIzMzE1YmY2ZDQzYTZlZjc5NjU=

data/lib/capistrano/magic_recipes/version.rb

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

data/lib/capistrano/tasks/monit.rake

@@ -28,6 +28,7 @@ namespace :load do
     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 }

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

@@ -21,9 +21,9 @@ 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
-  group <%= fetch(:sidekiq_monit_group, fetch(:application)) %>-sidekiq
-  # if does not exist then alert
-  if totalmem is greater than <%= fetch( :monit_sidekiq_totalmem_mb, 300 )%> MB for 2 cycles then restart
+  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 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

@@ -1,12 +1,11 @@
 # Monit configuration for THIN :  <%= fetch(:application) %>  (<%= fetch(:stage) %>)
 <%  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) %>
-    group thin-<%= fetch(:stage) %>
+    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 %>' " 
     if does not exist then alert
-    if mem > 200.0 MB for 1 cycles then restart
+    if mem > <%= fetch( :monit_thin_totalmem_mb, 300 ) %> MB for 1 cycles then restart
     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,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: capistrano-postgresql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: MagicRecipesTwo contains our most used deployment recipes for Capistrano-3.
@@ -165,17 +165,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Some recipes for rails-4 and capistrano-3.