mina-ng-puma 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7ff92738b7a21a7e6a6cd66258201ef8c42e399ffd2bb2e59bca8d70a9a8b9e
-  data.tar.gz: c056becb525af7c2b690052e18695c743697b4195152be752b060d97422e4a44
+  metadata.gz: 252dc65fd614942078f9e648b52052e03bd900c5e6c62ac42eb3d78d62987c6d
+  data.tar.gz: e753421c3578992fc2c2cf71512e3175a06de2308180486747b7c1184ee8080d
 SHA512:
-  metadata.gz: 4716a49a617df7a5f525cc32581fc8c8666ff33b285895af3b633f2e28c333ceb8a7c3432cd79f2a8505a2b3fb5e849528d510d36779ff9115ec0d1d0f25235e
-  data.tar.gz: 062cf312f432336561393d685c00d2f9cef45fbc6923728de0f76126bda0df4a4ba6e6de4fab527cf1676f2bea47582a713d4d9326cf75524115f5dc86b015ae
+  metadata.gz: ebba072ded0c6c466c2bae792c3ce838c2a41929716a66e0451a4147ba5a9edb851bca1ac30604a10680eac704ca6c3de510b1b562f6f0c906c24cfee623467e
+  data.tar.gz: 61552a2aa2cee1d2782b556daa63c558b607d5e522f81417794db3cc0af49489a0cd0c07fb2d34f99c7656c56296de938191d0530d423edc34ecc89355b76b2c

data/lib/mina/puma/tasks.rake

@@ -52,6 +52,7 @@ namespace :puma do
   task :phased_restart do
     comment "Restart Puma -- phased..."
     pumactl_restart_command 'phased-restart'
+    wait_phased_restart_successful_command
   end
 
   desc 'Restart puma (hard restart)'
@@ -109,6 +110,43 @@ namespace :puma do
     command cmd
   end
 
+  def wait_phased_restart_successful_command
+    cmd = %{
+      started_flag=false
+      default_times=120
+      times=$default_times
+      cd #{fetch(:puma_root_path)}
+      echo "Waiting phased-restart finish( default: $default_times seconds)..."
+      while [ $times -gt 0 ]; do
+        if [ -e "#{fetch(:puma_config)}" ]; then
+          # Just output the old workers number
+          #{fetch(:pumactl_cmd)} -F #{fetch(:puma_config)} stats | grep -E -o '"old_workers": [0-9]+'
+          if #{fetch(:pumactl_cmd)} -F #{fetch(:puma_config)} stats | grep '"old_workers": 0';then
+            started_flag=true
+            break
+          fi
+        else
+          # Just output the old workers number
+          #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} -C "unix://#{fetch(:pumactl_socket)}" --pidfile #{fetch(:puma_pid)} stats | grep -E -o '"old_workers": [0-9]+'
+          if #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} -C "unix://#{fetch(:pumactl_socket)}" --pidfile #{fetch(:puma_pid)} stats | grep '"old_workers": 0'; then
+            started_flag=true
+            break
+          fi
+        fi
+        sleep 1
+        times=$[$times -1]
+      done
+
+      if [ $started_flag == false ]; then
+        echo "Waiting phased-restart timeout(default: $default_times seconds), please check it!!!"
+        exit 1
+      else
+        echo "Phased-restart have finished, enjoy it!"
+      fi
+    }
+    command cmd
+  end
+
   def wait_quit_or_force_quit_command
     cmd = %{
       quit_flag=false

data/lib/mina/puma/version.rb

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

metadata

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