capistrano-base_helper 0.0.6 → 0.0.7

data/README.md

@@ -23,7 +23,7 @@ _Note: The tasks will not work unless you have installed any monit services_
 
 All these tasks do monit tasks for all services setup with monit.
 
-```ruby
+```
 cap monit:disable               # Disable monit services for application
 cap monit:enable                # Enable monit services for application
 cap monit:main_config           # Setup main monit config file (/etc/monit/monitrc)
@@ -37,11 +37,31 @@ cap monit:status                # Status monit (global)
 cap monit:stop                  # Stop monitoring the application permanent (Monit saves state)
 ```
 
+#### Setup in your deploy file
+
+You can add this to deploy.rb or env.rb in order to automatically monitor/unmonitor tasks
+
+It is important to unmonitor tasks while deploying as they can trigger stops/restarts to the app that monit thinks are "crashes"
+
+_Note: This is already done in monit\_base.rb, so no additional setup in deploy.rb or env.rb required_
+
+```ruby
+before "deploy", "monit:unmonitor"
+after  "deploy", "monit:monitor"
+```
+
+If you want monit to automatically start/stop runit instead of triggering seperately
+
+```ruby
+before "monit:unmonitor", "monit:stop"
+after  "monit:monitor", "monit:start"
+```
+
 ### Runit
 
 All these tasks do runit tasks for all services setup with runit.
 
-```ruby
+```
 cap runit:disable               # Disable runit services for application
 cap runit:enable                # Enable runit services for application
 cap runit:once                  # Only start services once.
@@ -51,6 +71,17 @@ cap runit:start                 # Start all runit services for current applicati
 cap runit:stop                  # Stop all runit services for current application
 ```
 
+#### Setup in your deploy file
+
+You can add this to deploy.rb or env.rb in order to automatically start/stop tasks
+
+```ruby
+before "deploy", "runit:stop"
+after  "deploy", "runit:start"
+```
+
+See each gem if you want to start/stop each service separate instead of together.
+
 ## Assumptions
 
 There are some assumptions when using this with capistrano.

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/capistrano-base_helper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-base_helper"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Ringstad"]
-  s.date = "2013-07-08"
+  s.date = "2013-07-29"
   s.description = "Helpers for capistrano recipes using runit/monit. Currently: capistrano-puma and capistrano-delayed_job"
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [

data/lib/capistrano/base_helper/monit_base.rb

@@ -42,9 +42,9 @@ Capistrano::Configuration.instance(true).load do
   after "monit:setup", "monit:enable"
   after "monit:enable", "monit:reload"
 
-  # must trigger monitor AFTER deploy
+  # must trigger monitor after deploy
   after "deploy", "monit:monitor"
-  # must trigger unmonitor BEFORE deploy
+  # must trigger unmonitor before deploy
   before "deploy", "monit:unmonitor"
 
   before "monit:disable", "monit:unmonitor"
@@ -81,7 +81,7 @@ Capistrano::Configuration.instance(true).load do
         # restart monit, as main config is now updated
         run "#{sudo} service monit restart"
         puts "----------------------------------------"
-        puts "Sleeping for #{(fetch(:monit_daemon_time).to_i + fetch(:monit_start_delay).to_i + 10)} seconds to wait for monit to be ready"
+        puts "Sleeping for #{fetch(:monit_start_delay).to_i + 10)} seconds to wait for monit to be ready"
         puts "----------------------------------------"
         sleep (fetch(:monit_start_delay).to_i + 2)
       end

data/templates/runit/finish.erb

@@ -7,7 +7,7 @@
 echo "Stopping all services for <%= c.fetch(:application) %> running as <%= c.fetch(:user) %>"
 
 # Force all services to stop
-sv -w600 force-stop '<%= c.fetch(:runit_dir) %>/*'
+sv -w600 force-stop <%= c.fetch(:runit_dir) %>/*
 
 # "Exit" all services
-sv exit '<%= c.fetch(:runit_dir) %>/*'
+sv exit <%= c.fetch(:runit_dir) %>/*

data/templates/runit/run.erb

@@ -2,5 +2,13 @@
 # <% c = Capistrano::BaseHelper::get_capistrano_instance %>
 # Run services for <%= c.fetch(:application) %> as <%= c.fetch(:user) %> in env <%= Capistrano::BaseHelper.environment %>
 #
-exec 2>&1 
+
+# Redirect stderr so everything ends up in the log file
+exec 2>&1
+
+# Announce startup
+#
+echo "Starting all services for <%= c.fetch(:application) %> running as <%= c.fetch(:user) %>"
+
+# Start all services in folder <%= c.fetch(:runit_dir) %>
 exec chpst -u <%= c.fetch(:user) %> runsvdir "<%= c.fetch(:runit_dir) %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-base_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1132387968025362262
+      hash: 3304826460133394089
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: