sv 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc419ac67937b89b2a0519205e4b38b6346d73b5
-  data.tar.gz: 29b88973f788938d4410b970778806da8b9fe7a7
+  metadata.gz: b81e4dd77f7397174e6174b60951b0a8e68321cb
+  data.tar.gz: 6768356a525a8bf86795273a333f0a9556043d4b
 SHA512:
-  metadata.gz: 7622979c1a4afe44cded6315fda8f98c9368e98779edb7776b2c6e13c4bc9d50697fd07fff902b0bb623d9beee65917db38914416f01a1b22f2431ae7f3dcfdc
-  data.tar.gz: b661919407a5a9f97a22bf1ce23cc79cc2073008206f187e9b4b694ef9ab7efb4c941462ffd71e5a8de529d22b41f4ea195251967f9623e293fae1bb095876de
+  metadata.gz: fb03843e3d1c9bcecf7c4696fd21a9964bc87d5548567159da34b54eafcd69693438f797453c45eb91fb10b65eaeec1b127bfd0ce6b0b53ba344f0e7c8edaede
+  data.tar.gz: 3c1d508297b1b5b1893c599e2f07371fc698455e6d70af407830be2d9313b189b8cdfe4e57c18899e3608df2b7f28af7c86ddcae5821507da2658dd01014f11b

data/examples/jobs.yml

@@ -0,0 +1,4 @@
+- name: resque
+  command: tail -f log/production.log
+  env: RAILS_ENV=production, QUEUE='*'
+  startsecs: 1

data/examples/sv.rb

@@ -0,0 +1,3 @@
+instances ({
+  resque: 4
+})

data/lib/sv/api.rb

@@ -27,12 +27,25 @@ module Sv
     end
 
     def stop_job(group, name)
-      call "supervisor.stopProcess" if not job_stopped?(group, name)
+      call "supervisor.stopProcess", "#{group}:#{name}" if not job_stopped?(group, name)
     rescue XMLRPC::FaultException => e
       return true if e.faultString == "NOT_RUNNING"
       raise e
     end
 
+    def remove_group(name)
+      call "supervisor.stopProcessGroup", name
+      call "supervisor.removeProcessGroup", name
+    end
+
+    def add_group(name)
+      ok, output = call_safe("supervisor.addProcessGroup", name)
+      if not ok
+        msg = "adding group #{name} failed: #{output.faultString}"
+        raise Error, msg if not output.faultString =~ /\AALREADY_ADDED/
+      end
+    end
+
     def job_stopped?(group, name)
       job = call "supervisor.getProcessInfo", "#{group}:#{name}"
       job["state"] == 0 ? true : false
@@ -45,7 +58,7 @@ module Sv
     def print_status
       puts "pid #{pid}"
       jobs = self.jobs
-      name_width = jobs.map { |j| j.name.size }.max
+      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)
@@ -72,10 +85,31 @@ module Sv
       jobs = jobs_array.map { |j| OpenStruct.new(j) }
     end
 
+    def reread_config
+      call "supervisor.reloadConfig"
+    end
+
     def close_connection
       @rpc = nil
     end
 
+    def reopen_logs
+      Process.kill("USR2", pid)
+    rescue => e
+      raise Error, "unable to reopen logs"
+    end
+
+    def health_check
+      jobs = self.jobs
+      not_running_jobs = jobs.reject { |j| ["RUNNING", "STARTING"].include? j.statename }
+      if not_running_jobs.size > 0
+        names = not_running_jobs.map { |j| j.name }
+        str = names[0..4].join(", ")
+        msg = "jobs not running: #{str}"
+        raise Error, msg
+      end
+      puts "OK"
+    end
 
     private
 
@@ -92,6 +126,10 @@ module Sv
       raise ::Sv::Error, "error running command #{args[0]}"
     end
 
+    def call_safe(*args)
+      rpc.call2(*args)
+    end
+
     def uptime(started_at)
       return "-" if started_at.to_i == 0
       uptime = (Time.now.to_i - started_at).to_i

data/lib/sv/cli/server.rb

@@ -19,7 +19,9 @@ module Sv::Cli
         server.send command, auto_start: options[:auto_start], wait: options[:wait]
       when :'print-config'
         server.send :print_config
-      when :stop, :status
+      when :rr
+        server.send :rolling_restart
+      when :stop, :status, :reopen_logs, :health_check
         server.send command
       when :help
         help argv.shift

data/lib/sv/config.rb

@@ -1,6 +1,7 @@
 require 'sv/logger'
 require 'sv/error'
 require 'sv/job'
+require 'securerandom'
 
 module Sv
   class Config
@@ -12,6 +13,7 @@ module Sv
       @app_dir = app_dir
       @instances = {}
       @working_dir = app_dir
+      @namespace = SecureRandom.hex(3)
     end
 
     def socket_path
@@ -60,6 +62,7 @@ module Sv
       read_config("#{app_dir}/config/sv.rb")
       set_instances
       set_working_dir
+      set_namespace
     end
 
 
@@ -75,6 +78,12 @@ module Sv
       end
     end
 
+    def set_namespace
+      jobs_map.each do |name, job|
+        job.namespace = @namespace
+      end
+    end
+
     def read_config(path, optional: false)
       if not File.readable? path
         raise ::Sv::Error, "config file #{path} missing" if not optional

data/lib/sv/custom_logger.rb

@@ -17,7 +17,7 @@ module Sv
       when "WARN"
         "#{severity.downcase.bold.yellow} #{msg}\n"
       else
-        "#{severity.downcase.bold.blue} #{msg}\n"
+        "#{severity[0].upcase.bold.blue} #{msg}\n"
       end
     end
 

data/lib/sv/job.rb

@@ -2,7 +2,7 @@ module Sv
   class Job
 
     attr_reader :name
-    attr_writer :working_dir
+    attr_writer :working_dir, :namespace
 
     def initialize(name)
       set :name, name
@@ -12,6 +12,10 @@ module Sv
       attributes.fetch :name
     end
 
+    def group
+      @namespace ? "#{name}.#{@namespace}" : name
+    end
+
     def command(*args)
       set_or_get :command, args
     end
@@ -81,6 +85,18 @@ module Sv
       end
     end
 
+    def processes
+      processes = []
+      s = Struct.new(:name, :group)
+      numprocs.times do |i|
+        process = s.new
+        process.name = "#{name}_#{i.to_s.rjust(2,"0")}"
+        process.group = group
+        processes << process
+      end
+      processes
+    end
+
     private
 
     def attributes
@@ -124,16 +140,16 @@ module Sv
       end
     end
 
-
     def template
       @template ||= Pathname.new("#{__dir__}/templates/job.erb")
     end
 
     def binding
       attrs = OpenStruct.new(attributes)
+      attrs.group = group
       attrs.instance_eval { binding }
     end
-
+  
   end
 end
 

data/lib/sv/rolling_restart.rb

@@ -0,0 +1,82 @@
+require 'sv/logger'
+module Sv
+  class RollingRestart
+
+    include Logger
+
+    def initialize(jobs, api)
+      @jobs = jobs
+      @api = api
+    end
+
+    def run
+      init
+      @api.reread_config
+      stop_unneeded_processes
+      add_new_groups
+      replace_processes
+      remove_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
+      end
+    end
+
+    def add_new_groups
+      @new_groups.each { |g| @api.add_group g }
+    end
+
+    def replace_processes
+      @new_processes.each do |x|
+        old = @old_processes.find { |p| p.name == x.name }
+        if old
+          logger.debug "stopping #{old.group}:#{old.name}"
+          @api.stop_job old.group, old.name
+          logger.info "#{"\u2219".bold.blue} #{x.name}: #{old.group} -> #{x.group}"
+        else
+          logger.info  "#{"+".bold.green} #{x.name}: #{x.group}"
+        end
+        @api.start_job x.group, x.name
+      end
+    end
+
+    def remove_old_groups
+      @old_groups.each { |g| @api.remove_group g }
+    end
+
+    def unneeded_processes
+      @old_processes.reject { |p| @new_processes.find {|n| n.name == p.name }}
+    end
+
+    def load_old_processes
+      @old_processes = @api.jobs
+    end
+
+    def load_old_groups
+      @old_groups = @old_processes.map { |p| p.group }.uniq
+    end
+
+    def load_new_processes
+      @new_processes = []
+      @jobs.each do |j|
+        j.processes.each { |p| @new_processes << p }
+      end
+      return @new_processes
+    end
+
+    def load_new_groups
+      @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
+
+  end
+end

data/lib/sv/server.rb

@@ -2,6 +2,7 @@ require 'sv/config'
 require 'sv/api'
 require 'sv/supervisor/config'
 require 'sv/status'
+require 'sv/rolling_restart'
 
 module Sv
   class Server
@@ -39,6 +40,27 @@ module Sv
       start auto_start: auto_start, wait: wait
     end
 
+    def rolling_restart
+      init_once
+      if not server_status.running?
+        start auto_start: true, wait: true
+        return
+      end
+      supervisor_config.generated_path
+      rolling_restart = RollingRestart.new(config.jobs, api)
+      rolling_restart.run
+    end
+
+    def reopen_logs
+      return if not server_status.running?
+      api.reopen_logs
+    end
+
+    def health_check
+      raise Error, "server not running" if not server_status.running?
+      api.health_check
+    end
+
     def start_jobs
       api.start_jobs
       puts api.errors

data/lib/sv/templates/job.erb

@@ -1,5 +1,5 @@
-[program:<%= name %>]
-process_name=%(program_name)s_%(process_num)02d
+[program:<%= group %>]
+process_name=<%= name %>_%(process_num)02d
 command=<%= command %>
 directory=<%= working_dir %>
 numprocs=<%= numprocs %>

data/lib/sv/version.rb

@@ -1,3 +1,3 @@
 module Sv
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sv
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,8 @@ files:
 - README.md
 - Rakefile
 - bin/sv
+- examples/jobs.yml
+- examples/sv.rb
 - lib/sv.rb
 - lib/sv/api.rb
 - lib/sv/base.rb
@@ -63,6 +65,7 @@ files:
 - lib/sv/ext/string.rb
 - lib/sv/job.rb
 - lib/sv/logger.rb
+- lib/sv/rolling_restart.rb
 - lib/sv/server.rb
 - lib/sv/status.rb
 - lib/sv/supervisor/config.rb