magic_recipes_two 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 551ef2c39850350a2085c4a5a0a2bf89b1546547
-  data.tar.gz: 597fde89844bf4b562a3403f6007b27ebba3e8c4
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTk0ZGM5MDVjNDY3OGUwNjQ0NjcxZjE1MzNlODgzNjYwNjJiODM1OA==
+  data.tar.gz: !binary |-
+    ZWVmZjNmNjYxNWVkOWQwMWExNGZhYzUwZjJhNTVkM2M4ZDI4NWMyZQ==
 SHA512:
-  metadata.gz: b264e3fc3d6a8726551bb4689d4016a48aa52d8f762a04c0784f1d9e8231c9f66fa0566b0bf0a06623231eb00c0ec1e49f83d8a980b56ce28cc13dc420bcf152
-  data.tar.gz: 02f97e3d04239c8fceb7247f0e7efef4aec1dce873827e46d3974ccd755025da595365b11ea312725cace35b20bb5264cd3effc27eedf6768bc61ee1d5ae365e
+  metadata.gz: !binary |-
+    ODNkYWU0NDBkNzI1OTI3YWFkODY3NmE4YTlhOWU4YjU4ODMzOWEwNjIwOTZi
+    NTlhZDA3MTFlMDk1NjMzY2U1M2NkMmI1MzhmMDg4NmZhNmY1ZWU3OGM1Zjkz
+    ODA1Y2JjOTYzY2MzMTFlMzVlNmZlZTg1ODg5YTI0NDdjZWJkMTA=
+  data.tar.gz: !binary |-
+    MDc5ODUxNjZjZjY1MjRlODExNGViMzk4MGNkMTlmYTQxZjZlYjBlY2M5Zjlj
+    NWY1OThhMGZmMmJkZDI3Y2I1N2Y0NDBkYTlhZGVkODc3NWExNTQxMTlhNzM5
+    MmQ5ZDZlZmU5NjczZDU3OGZmNzE0ZGVkNDBjNDJiNzliNTM2NWQ=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.32"
+    VERSION = "0.0.33"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -28,6 +28,8 @@ 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 }
+    ## Additional stuff for sidekiq (need secrets_key_base to be set)
+    set :monit_sidekiq_with_secret,   -> { false }
     ## WebClient
     set :monit_http_client,           -> { true }
     set :monit_http_domain,           -> { false }
@@ -152,6 +154,9 @@ namespace :deploy do
       end
     end
   end
+  # after :finished, :setup_monit_configs do
+  #   invoke "monit:setup" if fetch(:monit_active)
+  # end
   after :finished, :restart_monitoring do
     %w[sidekiq thin].each do |command|
       if fetch(:monit_active) && Array(fetch(:monit_processes)).include?(command)
@@ -159,7 +164,9 @@ namespace :deploy do
       end
     end
   end
-  after :finished, :setup_monit_configs do
-    invoke "monit:setup" if fetch(:monit_active)
-  end
+end
+
+desc 'Server setup tasks'
+task :setup do
+  invoke "monit:setup" if fetch(:monit_active)
 end

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

@@ -19,13 +19,13 @@
 %>
 check process <%= sidekiq_service_name(idx) %>
   with pidfile "<%= pid_file %>"
-  start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiq <%= args.join(" ") %>'" with timeout 30 seconds
-  stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiqctl stop <%= pid_file %>' " with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> 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 90 seconds
+  stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiqctl stop <%= pid_file %>' " with timeout 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 3 restarts within 5 cycles then timeout
-  alert <%= fetch(:monit_mail_to) %> only on { pid }
+  # alert <%= fetch(:monit_mail_to) %> only on { pid }
   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

@@ -9,6 +9,6 @@
     if mem > 200.0 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 }
+    # alert <%= fetch(:monit_mail_to) %> only on { pid }
     if changed pid 2 times within 20 cycles then alert
 <% end %>

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-10 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.