magic_recipes_two 0.0.34 → 0.0.35

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2U0OTNiMTNiYmQzNjJmYzU3ZjMwMzNhOWMxZTNjNjE1YjA1ZGQyOA==
-  data.tar.gz: !binary |-
-    ZmU5OGM5ZmVlOWJmNmJlNjc3M2Q5Y2VkZDM4NjVhNWJiNzBkODNkNQ==
+SHA1:
+  metadata.gz: cf4a74c8306964388150c3c4af548591600b410b
+  data.tar.gz: a20001f992eb0b8d0cb8196e64c93fb1ad843293
 SHA512:
-  metadata.gz: !binary |-
-    NGU4NmVjM2Q2NWVjMzMwZmE0ODE0ZmI3MmNhMzZhZTA4N2Y3OTM4OTJmODk0
-    ZTZkZGY3ZGJhNmJmYTI4YzA0NTE4YmY2M2M3ZDU2N2RmNTgzNzE4ZTUzZmE2
-    MWU2NWE4NDEzMWQyZDYwZGUwYTA2MmIwZTVlMGZmMjlmNTY0OTY=
-  data.tar.gz: !binary |-
-    NWQ0ZTgwY2Q1ODQ4NjhkMWQ0MDhlYjk1ZDAzYzRkNDRlZGVjYmIxZThhNWUx
-    ZTA3ZDE5MDlmNzkxYWE4MzU2NzgyNjI0YjE0ZGI2ZDhjN2ZhNzk4ZGVhZGJj
-    NDM2ZjFjNDVhZmVlOWUyZTVkYWM3ODM1MzdlOGIzNGU1MDg1Yjc=
+  metadata.gz: bcab40a8738cda8b6b48e1be9dcb81134bc14232b0e4d3b5738914664f8975a74ad472ff76346cc6cce4c3616e660e37fa1b00e82ae9634b6437c7ec61f96129
+  data.tar.gz: 238e03c2827db7c99f69b088d6aed3e1b13fcf11b84af2cbeeaea6783c7259a8c57b800d555cd610f8ae7cc524d65f3f9f5f6aa32918a395d951fc4ee9d4d5e2

data/lib/capistrano/magic_recipes/version.rb

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

data/lib/capistrano/tasks/monit.rake

@@ -30,6 +30,8 @@ namespace :load do
     set :monit_thin_with_secret,      -> { false }
     ## 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 }
     ## WebClient
     set :monit_http_client,           -> { true }
     set :monit_http_domain,           -> { false }

data/lib/capistrano/tasks/thin.rake

@@ -23,7 +23,7 @@ namespace :thin do
   
   
   desc "rewrite thin-configurations"
-  task :reconf => ['nginx:load_vars'] do
+  task :reconf do
     on release_roles fetch(:thin_roles) do
       within current_path do
         magic_template("thin_app_yml", '/tmp/thin_app.yml')
@@ -37,7 +37,7 @@ namespace :thin do
   
   %w[start stop restart].each do |command|
     desc "#{command} thin"
-    task command => ['nginx:load_vars'] do
+    task command do
       on release_roles fetch(:thin_roles) do
         within current_path do
           execute :bundle, :exec, :thin, "#{command} -C config/thin_app_#{fetch(:stage)}.yml"

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

@@ -19,11 +19,11 @@
 %>
 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 90 seconds
-  stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiqctl stop <%= pid_file %>' " with timeout 90 seconds
+  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 200 MB for 2 cycles then restart
+  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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-19 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.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Some recipes for rails-4 and capistrano-3.