capistrano-pumaio 0.0.8 → 0.0.9

data/README.md

@@ -25,12 +25,24 @@ cap puma:monit:disable          # Disable and stop monit services for puma
 cap puma:monit:enable           # Enable monit services for puma
 cap puma:monit:monitor          # Monitor puma
 cap puma:monit:restart          # Restart monit services for puma
+cap puma:monit:phased_restart   # Phased-Restart monit services for puma
 cap puma:monit:setup            # Setup Puma monit-service
 cap puma:monit:start            # Start monit services for puma (will also tr...
 cap puma:monit:stop             # Stop monit services for puma (will also sto...
 cap puma:monit:unmonitor        # Purge puma monit configuration
 ```
 
+_Note about phased restarts:_
+
+_It is not possible to have the application preloaded by puma when using phased restarts._
+_You must therefore set the option :puma\_use\_preload\_app to to false in your deploy.rb_
+
+_Like this:_
+
+```ruby
+set :puma_use_preload_app, false # If you are going to use phased restarts
+```
+
 #### Setup in your deploy file
 
 You can add this to deploy.rb or env.rb in order to automatically start/stop puma using monit. It is not needed if you use runit to stop/start/restart the service.

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/capistrano-pumaio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-pumaio"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leif Ringstad"]
-  s.date = "2013-07-31"
+  s.date = "2013-08-01"
   s.description = "Capistrano recipes for puma using runit and monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [

data/lib/capistrano/puma/config.rb

@@ -16,6 +16,8 @@ Capistrano::Configuration.instance(true).load do
   _cset :puma_control_file, "#{File.join(fetch(:sockets_path), "pumactl.sock")}"
   _cset :puma_control_url, "unix://#{fetch(:puma_control_file)}"
 
+  _cset :puma_use_preload_app, true # This must be set to false if phased restarts should be used
+
   _cset :puma_activate_control_app, true
 
   _cset :puma_on_restart_active, true

data/lib/capistrano/puma/runit.rb

@@ -8,17 +8,29 @@ Capistrano::Configuration.instance(true).load do
   # enable service after update in case it has not been setup or is disabled
   # Service should probably be started as well?
   after "deploy:update", "puma:runit:enable"
-  before "puma:runit:setup", "puma:runit:flush_sockets"
+  before "puma:runit:setup", "puma:flush_sockets"
+  before "puma:runit:setup", "puma:setup"
   before "puma:runit:quit", "puma:runit:stop"
 
   namespace :puma do
+
+    desc "Setup Puma configuration"
+    task :setup, :roles => :app do
+      Capistrano::BaseHelper.prepare_path(File.join(fetch(:shared_path), "sockets"), fetch(:user), fetch(:group))
+
+      # Create puma configuration file
+      Capistrano::BaseHelper::generate_and_upload_config(fetch(:puma_local_config), fetch(:puma_remote_config))
+    end
+
+    desc "Flush Puma sockets, as they can end up 'hanging around'"
+    task :flush_sockets, :roles => :app do
+      run "rm -f #{fetch(:puma_socket_file)}; rm -f #{fetch(:puma_control_file)}"
+    end
+
     namespace :runit do
       desc "Setup Puma runit-service"
       task :setup, :roles => :app do
-        Capistrano::BaseHelper.prepare_path(File.join(fetch(:shared_path), "sockets"), fetch(:user), fetch(:group))
 
-        # Create puma configuration file
-        Capistrano::BaseHelper::generate_and_upload_config(fetch(:puma_local_config), fetch(:puma_remote_config))
 
         # Create runit config
         Capistrano::RunitBase.create_service_dir(puma_runit_service_name)
@@ -34,8 +46,8 @@ Capistrano::Configuration.instance(true).load do
         Capistrano::RunitBase.make_service_scripts_executeable(puma_runit_service_name)
         # Set correct permissions/owner on log path
         Capistrano::RunitBase.create_and_permissions_on_path(fetch(:puma_log_path))
-      end 
-      
+      end
+
       desc "Enable Puma runit-service"
       task :enable, :roles => :app do
         Capistrano::RunitBase.enable_service(puma_runit_service_name)
@@ -70,13 +82,56 @@ Capistrano::Configuration.instance(true).load do
 
       desc "Restart Puma runit-service"
       task :restart, :roles => :app do
-        # Send USR2 to puma in order to restart it....
-        Capistrano::RunitBase.control_service(puma_runit_service_name, "2")
+        result     = nil
+        started    = false
+
+        # It is not possible to see if a restart is in progress using the pumactl tool as of now.
+
+        # restarting = false
+        # # check if puma is already performing a restart
+        # invoke_command("cd #{fetch(:current_path)}; [[ $(#{fetch(:puma_control)} -S #{fetch(:puma_state_file)} status) == *restart* ]] && echo 'restarting';true") do |ch, stream, out|
+        #   result = (/restart/ =~ out)
+        # end
+        # restarting = true unless result.nil?
+        # result     = nil
+
+        # if restarting == false
+          # check if it is running
+          invoke_command("cd #{fetch(:current_path)}; [[ $(#{fetch(:puma_control)} -S #{fetch(:puma_state_file)} status) == *started* ]] && echo 'started';true") do |ch, stream, out|
+            result = (/started/ =~ out)
+          end
+          started = true unless result.nil?
+
+          if started == true
+            logger.info("\nRestarting puma")
+            # Send USR2 to puma in order to restart it....
+            Capistrano::RunitBase.control_service(puma_runit_service_name, "2")
+          else
+            logger.important("\nStarting puma, (wasn't running before)")
+            Capistrano::RunitBase.start_service(puma_runit_service_name)
+          end
+        # end
       end
-      
-      desc "Flush Puma sockets, as they can end up 'hanging around'"
-      task :flush_sockets, :roles => :app do
-        run "rm -f #{fetch(:puma_socket_file)}; rm -f #{fetch(:puma_control_file)}"
+
+      desc "Phased Restart of Puma"
+      task :phased_restart, :roles => :app do
+        result     = nil
+        started    = false
+
+        # check if it is running
+        invoke_command("cd #{fetch(:current_path)}; [[ $(#{fetch(:puma_control)} -S #{fetch(:puma_state_file)} status) == *started* ]] && echo 'started';true") do |ch, stream, out|
+          result = (/started/ =~ out)
+        end
+        started = true unless result.nil?
+
+        if started == true
+          # Send USR1 to puma in order to restart it....
+          logger.info("\nPhased restart of puma")
+          Capistrano::RunitBase.control_service(puma_runit_service_name, "1")
+        else
+          logger.important("\nStarting puma, (wasn't running before)")
+          Capistrano::RunitBase.start_service(puma_runit_service_name)
+        end
       end
 
       desc "Purge Puma runit configuration"
@@ -84,7 +139,7 @@ Capistrano::Configuration.instance(true).load do
         Capistrano::RunitBase.force_control_service(puma_runit_service_name, "force-stop", true)
         Capistrano::RunitBase.purge_service(puma_runit_service_name)
       end
-      
+
     end
   end
 end

data/templates/runit/config.rb.erb

@@ -8,8 +8,11 @@ state_path '<%= c.fetch(:puma_state_file) %>'
 environment '<%= "#{Capistrano::BaseHelper.environment}" %>'
 <%= "activate_control_app '#{c.fetch(:puma_control_url)}'" if c.fetch(:puma_activate_control_app) %>
 
-# Must preload application in case there are errors, if not, infinite restarts will happen
-preload_app!
+# In some cases preloading the app is best to avoid some infinite restart loops, however, it cannot be used in
+# combination with phased restart.
+<%= "preload_app!" if c.fetch(:puma_use_preload_app) %>
+
+directory '<%= File.join(c.fetch(:deploy_to), "current") %>'
 
 # TODO - fix restart block!
 # <%= "on_restart do"              if c.fetch(:puma_on_restart_active) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-pumaio
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3189334886428706099
+      hash: 1012333913118032942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: