sv 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a91c30e6b02d359c7ce54a75001f0c47126818e0
-  data.tar.gz: dbb3c98d6847f33b4dc073c2877d41f81f632b3c
+  metadata.gz: 9dcb2b89e314decf911279e9cd7feb6001c564d9
+  data.tar.gz: c3f84f93c4ce52fc04016f02bed990ecdd43feb0
 SHA512:
-  metadata.gz: 475256d6937be2adbda674267a57fee9d6286b8273b48ac1007dd98065cc5f1bde8a907d20ad12d3b65d449f1c5934230e41d224319847ab6cdd38c905515722
-  data.tar.gz: 4f38b49b5a02d3c84896fd52a4e3b761f68047d66868cf6e2cfec8fd93a477fc5e7cd8eefd6399ab9cdccbe423a7ec2a053054316f00b0add82f8e922b2f529c
+  metadata.gz: ebc2862268835ea7475aba32fb9054de6d0b52ccd9d0e646f40ce52895fdd1620c9a3c2b5b471f9f7951f0f28e5ff6140d0fa3ec81aca6faf384244628486811
+  data.tar.gz: d9271545bdc58cbe294f2217575ea304155045f46e88755929a0c933eb2c47fe7db3a6f18de86d00e6e6b21339ee01d77e127797de39d16a0a05383ef3e9c42c

data/dev_bin/sv

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+load __dir__ + '/../bin/sv'

data/lib/sv/api.rb

@@ -18,6 +18,14 @@ module Sv
     end
 
     def shutdown
+      call "supervisor.stopAllProcesses", false
+      sleep 2
+      stopping = jobs.select { |j| j.statename == "STOPPING" }
+      stopping.each do |j|
+        puts "killing #{j.group}:#{j.name}"
+        Process.kill("KILL", j.pid)
+      end
+      sleep 1
       call "supervisor.shutdown"
       close_connection
     end
@@ -26,9 +34,9 @@ module Sv
       call "supervisor.startProcess", "#{group}:#{name}"
     end
 
-    def stop_job(group, name)
+    def stop_job(group, name, wait: true)
       return if job_stopped?(group, name)
-      ok, output = call_safe "supervisor.stopProcess", "#{group}:#{name}"
+      ok, output = call_safe "supervisor.stopProcess", "#{group}:#{name}", wait
       if not ok
         msg = "stopping job #{name} failed: #{output.faultString}"
         raise Error, msg if not output.faultString =~ /\ANOT_RUNNING/
@@ -61,12 +69,13 @@ module Sv
       puts "pid #{pid}"
       jobs = self.jobs
       name_width = jobs.map { |j| j.name.size }.max || 20
-      template = "%-#{name_width}s  %-10s %-7s %-20s\n"
-      printf template, "name", "state", "pid", "uptime"
-      puts "-"*(name_width + 10 + 7 + 20 + 2)
+      template = "%-#{name_width}s  %-10s %-7s %-20s %-50s\n"
+      printf template, "name", "state", "pid", "uptime", "dir"
+      puts "-"*(name_width + 10 + 7 + 20 + 50 + 2)
       jobs.each do |job|
         logger.debug { require 'pp'; PP.pp job.to_h, out="" ; out }
-        printf template, job.name, job.statename, job.pid, uptime(job.start)
+        dir = (job.statename == "STOPPING" || job.statename == "RUNNING" ) ? job_cwd(job.pid) : "-"
+        printf template, job.name, job.statename, job.pid, uptime(job.start), dir
       end
     end
 
@@ -87,6 +96,12 @@ module Sv
       jobs = jobs_array.map { |j| OpenStruct.new(j) }
     end
 
+    def active_groups
+      running_states = ["STOPPING", "RUNNING"]
+      running_jobs = jobs.select { |j| running_states.include? j.statename }
+      running_jobs.map { |j| j.group }.uniq
+    end
+
     def reread_config
       call "supervisor.reloadConfig"
     end
@@ -146,5 +161,9 @@ module Sv
       end
     end
 
+    def job_cwd(pid)
+      File.readlink "/proc/#{pid}/cwd"
+    end
+
   end
 end

data/lib/sv/job.rb

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

data/lib/sv/rolling_restart.rb

@@ -34,8 +34,7 @@ module Sv
         #stop older processes with same name
         old = @old_processes.select { |p| p.name == x.name }
         old.each do |o|
-          logger.debug "stopping #{o.group}:#{o.name}"
-          @api.stop_job o.group, o.name
+          stop_job o, x.stopwait
         end
 
         if old.empty?
@@ -48,7 +47,17 @@ module Sv
     end
 
     def remove_old_groups
-      @old_groups.each { |g| @api.remove_group g }
+      stopped_states = ["STOPPED", "FATAL", "EXITED"]
+      jobs = @api.jobs
+      @old_groups.each do |g|
+        stopped_count = jobs.select { |j| j.group == g && stopped_states.include?(j.statename) }.size
+        all_count = jobs.select { |j| j.group == g }.size
+        if stopped_count != all_count
+          puts "skip remove_group #{g}: #{all_count - stopped_count} processes running"
+          next
+        end
+        @api.remove_group g
+      end
     end
 
     def unneeded_processes
@@ -82,5 +91,16 @@ module Sv
       load_old_groups
     end
 
+    private
+
+    def stop_job(job, wait)
+      if wait
+        logger.debug "stopping #{job.group}:#{job.name}"
+      else
+        logger.debug "signaling #{job.group}:#{job.name} to stop"
+      end
+      @api.stop_job job.group, job.name, wait: wait
+    end
+
   end
 end

data/lib/sv/server.rb

@@ -81,6 +81,8 @@ module Sv
     def status
      if server_status.running?
        api.print_status
+       puts "-"* 20
+       puts "active_groups: #{api.active_groups.size}"
      else
        puts "Stopped"
      end

data/lib/sv/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sv
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - README.md
 - Rakefile
 - bin/sv
+- dev_bin/sv
 - examples/jobs.yml
 - examples/sv.rb
 - lib/sv.rb
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A wrapper for supervisord