sv 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dcb2b89e314decf911279e9cd7feb6001c564d9
-  data.tar.gz: c3f84f93c4ce52fc04016f02bed990ecdd43feb0
+  metadata.gz: 9d9872b80216a81aad002bd64e8cac3d47b674e4
+  data.tar.gz: c4400932bbce93772eff874fc3912739fc049815
 SHA512:
-  metadata.gz: ebc2862268835ea7475aba32fb9054de6d0b52ccd9d0e646f40ce52895fdd1620c9a3c2b5b471f9f7951f0f28e5ff6140d0fa3ec81aca6faf384244628486811
-  data.tar.gz: d9271545bdc58cbe294f2217575ea304155045f46e88755929a0c933eb2c47fe7db3a6f18de86d00e6e6b21339ee01d77e127797de39d16a0a05383ef3e9c42c
+  metadata.gz: f92d9e1d12cb73dc9bb07727b248e70ee30c08b4e4ac2b489719b9870c6445c86b591a32ce4a38e4be23e01dd266f6568d39ecfebc886b6ac0743b2f37daa1b5
+  data.tar.gz: fd1c18b1c919a9334e4026a6ff38e30bee9e5e4a4c882c689a11336e7ec7e5f27da570846d3ae9092514beff00a59e76c288605ab208466bf9ce23448b93a28f

data/lib/sv/api.rb

@@ -23,7 +23,11 @@ module Sv
       stopping = jobs.select { |j| j.statename == "STOPPING" }
       stopping.each do |j|
         puts "killing #{j.group}:#{j.name}"
-        Process.kill("KILL", j.pid)
+        begin
+          Process.kill("KILL", j.pid)
+        rescue => e
+          puts "warn #{j.pid}: #{e.message}"
+        end
       end
       sleep 1
       call "supervisor.shutdown"

data/lib/sv/job.rb

@@ -51,8 +51,8 @@ module Sv
       set_or_get :stopsignal, args
     end
 
-    def stopwait(*args)
-      set_or_get :stopwait, args
+    def stopwait_on_rr(*args)
+      set_or_get :stopwait_on_rr, args
     end
 
     def stopwaitsecs(*args)
@@ -92,12 +92,12 @@ module Sv
 
     def processes
       processes = []
-      s = Struct.new(:name, :group, :stopwait)
+      s = Struct.new(:name, :group, :stopwait_on_rr)
       numprocs.times do |i|
         process = s.new
         process.name = "#{name}_#{i.to_s.rjust(2,"0")}"
         process.group = group
-        process.stopwait = stopwait
+        process.stopwait_on_rr = stopwait_on_rr
         processes << process
       end
       processes
@@ -122,7 +122,7 @@ module Sv
         redirect_stderr: true,
         stdout_logfile: "/dev/null",
         stderr_logfile: "",
-        stopwait: true
+        stopwait_on_rr: true
       }
     end
 

data/lib/sv/rolling_restart.rb

@@ -18,10 +18,32 @@ module Sv
       remove_old_groups
     end
 
+    private
+
+    def init
+      load_new_processes
+      load_new_groups
+      load_old_processes
+      load_old_groups
+    end
+
     def stop_unneeded_processes
       unneeded_processes.each do |x|
         logger.info "#{"-".bold.red} #{x.name}: #{x.group}"
-        @api.stop_job x.group, x.name
+        stop_job x, false
+      end
+
+      sleep 1.5
+      stopping = unneeded_processes.select { |j| j.statename == "STOPPING" }
+      stopping.each do |j|
+        name = j.name.gsub(/_[0-9]+\z/, "")
+        matching_job = @jobs.find { |job| job.name == name }
+        kill_cond = !matching_job || matching_job.stopwait_on_rr
+        if kill_cond
+          kill_job j
+        else
+          puts "skip kill #{j.group}: #{j.name}"
+        end
       end
     end
 
@@ -34,7 +56,7 @@ module Sv
         #stop older processes with same name
         old = @old_processes.select { |p| p.name == x.name }
         old.each do |o|
-          stop_job o, x.stopwait
+          stop_job o, x.stopwait_on_rr
         end
 
         if old.empty?
@@ -61,7 +83,7 @@ module Sv
     end
 
     def unneeded_processes
-      @old_processes.reject { |p| @new_processes.find {|n| n.name == p.name }}
+      @api.jobs.reject { |p| @new_processes.find {|n| n.name == p.name }}
     end
 
     def load_old_processes
@@ -84,15 +106,6 @@ module Sv
       @new_groups = @new_processes.map { |p| p.group }.uniq
     end
 
-    def init
-      load_new_processes
-      load_new_groups
-      load_old_processes
-      load_old_groups
-    end
-
-    private
-
     def stop_job(job, wait)
       if wait
         logger.debug "stopping #{job.group}:#{job.name}"
@@ -102,5 +115,14 @@ module Sv
       @api.stop_job job.group, job.name, wait: wait
     end
 
+    def kill_job(job)
+      puts "killing #{job.group}:#{job.name}"
+      begin
+        Process.kill("KILL", job.pid)
+      rescue => e
+        puts "warn #{job.pid}: #{e.message}"
+      end
+    end
+
   end
 end

data/lib/sv/version.rb

@@ -1,3 +1,3 @@
 module Sv
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sv
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler