mina-ng-puma 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 252dc65fd614942078f9e648b52052e03bd900c5e6c62ac42eb3d78d62987c6d
-  data.tar.gz: e753421c3578992fc2c2cf71512e3175a06de2308180486747b7c1184ee8080d
+  metadata.gz: 8fb27c66f43bd929905dc3630f3341306ecfce266da35d7d50ab17e8aeadb046
+  data.tar.gz: 71f618ff61cffebf415d091ed31d70ca8d86db892334bfa283d95dfa7dce2ada
 SHA512:
-  metadata.gz: ebba072ded0c6c466c2bae792c3ce838c2a41929716a66e0451a4147ba5a9edb851bca1ac30604a10680eac704ca6c3de510b1b562f6f0c906c24cfee623467e
-  data.tar.gz: 61552a2aa2cee1d2782b556daa63c558b607d5e522f81417794db3cc0af49489a0cd0c07fb2d34f99c7656c56296de938191d0530d423edc34ecc89355b76b2c
+  metadata.gz: c6dcf8e41babc457858a989283635548bd66c38047fd2e71a45eed74ab5f415f4a108a2fae78ea94ef018b5766ea66076c467f53a1a246a4fddfc12c8fb23395
+  data.tar.gz: d72773a861a9b2e226837bf9bb5887029de713b4fda9e818426fb604e4c02c26ad754c03e2a67243eaca254f9a9c1294574c7a4489e7fedae5f53fb3a940bd86

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Tobias Sandelius
+Copyright (c) 2019 WinDy
 
 MIT License
 

data/README.md

@@ -4,13 +4,14 @@ I refactor mina-puma( https://github.com/untitledkingdom/mina-puma ) because of
 
 1. `phased_restart` and `restart` need start puma correctly when puma is down.
 2. `phased_restart` and `restart` should confirm puma restart successfully.
-3. check `puma_pid` instead of `pumactl_socket`.
+3. Add `smart_restart` mode, it will first try to do `phased_restart`, when failed, using `hard_restart` instead.
 
 [Mina](https://github.com/nadarei/mina) tasks for handle with
 [Puma](https://github.com/puma/puma).
 
 This gem provides several mina tasks:
 
+    mina puma:smart_restart   # Restart puma ( phased_restart then hard_restart )
     mina puma:phased_restart  # Restart puma (using phased restart)
     mina puma:hard_restart    # Restart puma (using stop, then start)
     mina puma:restart         # Restart puma (using pumactl)
@@ -20,7 +21,7 @@ This gem provides several mina tasks:
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your Rails application's Gemfile:
 
     gem 'mina-ng-puma', require: false
 
@@ -28,11 +29,10 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Note: You should remove `mina-puma` gem to ignore namespace conflict if you have install it before.
 
-    $ gem install mina-ng-puma
+    $ gem uninstall mina-puma
 
-Note: by just including this gem, does not mean your development server will be Puma, for that, you need explicitly add `gem 'puma'` to your Gemfile.
 
 ## Usage
 
@@ -86,7 +86,7 @@ task :deploy do
 
     on :launch do
       ...
-      invoke :'puma:phased_restart'
+      invoke :'puma:smart_restart'
     end
   end
 end

data/lib/mina/puma/tasks.rake

@@ -50,19 +50,36 @@ namespace :puma do
 
   desc 'Restart puma (phased restart)'
   task :phased_restart do
-    comment "Restart Puma -- phased..."
+    comment "Restart Puma -- phased mode..."
     pumactl_restart_command 'phased-restart'
     wait_phased_restart_successful_command
   end
 
   desc 'Restart puma (hard restart)'
   task :hard_restart do
-    comment "Restart Puma -- hard..."
+    comment "Restart Puma -- hard mode..."
     invoke 'puma:stop'
     wait_quit_or_force_quit_command
     invoke 'puma:start'
   end
 
+  desc 'Restart puma (smart restart)'
+  task :smart_restart do
+    comment "Restart Puma -- smart mode..."
+    comment "Trying phased restart..."
+    pumactl_restart_command 'phased-restart'
+    hard_restart_script = %{
+      echo "Phased-restart have failed, using hard-restart mode instead..." \n
+    }
+    # TODO: refactor it when we have better method
+    # hacking in mina commands.process to get hard_restart script
+    on :puma_smart_restart_tmp do
+      invoke 'puma:hard_restart'
+      hard_restart_script += commands.process
+    end
+    wait_phased_restart_successful_command(60, hard_restart_script)
+  end
+
   desc 'Get status of puma'
   task :status do
     comment "Puma status..."
@@ -110,10 +127,15 @@ namespace :puma do
     command cmd
   end
 
-  def wait_phased_restart_successful_command
+  def wait_phased_restart_successful_command(default_times = 120, exit_script = nil)
+    default_exit_script = %{
+      echo "Please check it manually!!!"
+      exit 1
+    }
+    exit_script ||= default_exit_script
     cmd = %{
       started_flag=false
-      default_times=120
+      default_times=#{default_times}
       times=$default_times
       cd #{fetch(:puma_root_path)}
       echo "Waiting phased-restart finish( default: $default_times seconds)..."
@@ -138,8 +160,8 @@ namespace :puma do
       done
 
       if [ $started_flag == false ]; then
-        echo "Waiting phased-restart timeout(default: $default_times seconds), please check it!!!"
-        exit 1
+        echo "Waiting phased-restart timeout(default: $default_times seconds)..."
+        #{exit_script}
       else
         echo "Phased-restart have finished, enjoy it!"
       fi

data/lib/mina/puma/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Puma
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-ng-puma
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - windy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Next Generation Puma tasks for Mina