uc 0.0.7 → 0.0.8

data/lib/uc/unicorn/paths.rb

@@ -0,0 +1,54 @@
+require 'pathname'
+require 'uc/logger'
+
+module Uc
+  module Unicorn
+    class Paths
+
+      include ::Uc::Logger  
+
+      attr_reader :app_dir
+
+      def initialize(app_dir)
+        @app_dir = app_dir 
+      end
+
+      def stdout_log
+        rpath "log/unicorn.stdout.log"
+      end
+
+      def stderr_log
+        rpath "log/unicorn.stderr.log"
+      end
+
+      def socket
+        rpath "tmp/sockets/unicorn.sock"
+      end
+
+      def pid_file
+        rpath "tmp/pids/unicorn.pid"
+      end
+
+      def lock_file
+        rpath "tmp/unicorn.lock"
+      end
+
+      def unicorn_config
+        rpath "tmp/unicorn_config.rb"
+      end
+
+      def unicorn_template
+        "#{__dir__}/../templates/unicorn.erb"
+      end
+
+      private
+
+     def rpath(path)
+        "#{app_dir}/#{path}"
+      end
+
+
+
+    end
+  end
+end

data/lib/uc/unicorn/prestart.rb

@@ -1,83 +1,49 @@
 require 'uc/logger'
-require 'uc/mqueue'
+module Uc
+  module Unicorn
+    class Prestart
 
-module Uc; module Unicorn;
-  class Prestart
+      include ::Uc::Logger
+      attr_reader :server, :worker, :url
 
-    include ::Uc::Logger
 
-    attr_reader :server, :worker, :queue_name, :url
-    attr_accessor :run_id
-
-    def initialize(server, worker, queue_name, url: "/", run_id: nil)
-      @server = server
-      @worker = worker
-      @url = url
-      @queue_name = queue_name
-      @run_id = run_id
-    end
-
-    def app
-      @app ||= server.instance_variable_get("@app")
-    end
-
-    def run
-      response = app.call(rack_request)
-      body = response[2]
-      body.close
-      end_prestart
-    rescue => e
-      logger.warn "pre start failed for worker : #{e.message}"
-    end
-
-
-    private
-
-    def worker_id
-      worker.nr + 1
-    end
-
-    def rack_request
-      Rack::MockRequest.env_for("http://127.0.0.1/#{url}")
-    end
+      def initialize(server, worker, url: "/")
+        @server = server
+        @worker = worker
+        @url = url
+      end
+    
+      def app
+        @app ||= server.instance_variable_get("@app")
+      end
 
-    def last_worker?
-      (worker.nr + 1) == server.worker_processes
-    end 
+      def run
+        make_prestart_request
+      end
 
-    def end_prestart
-      if last_worker?
-        logger.debug "[ps] no_event #{worker_id}"
-        return
+      def make_prestart_request
+        event_stream.debug "prestarting worker #{id}"
+        response = app.call(rack_request)
+        body = response[2]
+        if body.is_a? Rack::BodyProxy
+          body.close
+        end
+
+        event_stream.debug "worker #{id} prestart successful"
+      rescue => e
+        event_stream.warn "prestart failed for worker #{id}, #{e.class}"
       end
-      logger.debug "[ps] start #{worker_id}"
-      send_prestart_end
-      mq_log "prestart end worker #{worker_id}"
-      logger.debug "[ps] end #{worker_id}"
-    end
 
-    def send_prestart_end
-      mq.create
-      mq.clear
-      mq.nb_writer do |writer|
-        writer.send prestart_end_event
+      def id
+        @id ||= worker.nr + 1
       end
-    rescue Errno::ENOENT, Errno::EAGAIN, Errno::EACCES => e
-      logger.warn "prestart failed for worker #{worker.nr + 1}: #{e.class}"
-    end
 
-    def prestart_end_event
-      run_id ? "prestart_end_#{run_id}" : "prestart_end" 
-    end
+      private
 
-    def mq
-      @mq ||= ::Uc::Mqueue.new(prestart_queue_name, max_msg: 10, msg_size: 30)
-    end
+      def rack_request
+        Rack::MockRequest.env_for("http://127.0.0.1/#{url}")
+      end
 
-    def prestart_queue_name
-      "#{queue_name}_prestart_#{worker.nr}"
     end
-
   end
-end; end
-
+end

data/lib/uc/unicorn/ready_event.rb

@@ -0,0 +1,58 @@
+require 'uc/logger'
+require 'uc/mqueue'
+require 'uc/unicorn/helper'
+
+module Uc
+  module Unicorn
+    class ReadyEvent
+
+      include ::Uc::Logger
+      include ::Uc::Unicorn::Helper
+
+      attr_accessor :run_id
+      attr_reader :ready_wait, :server, :worker
+
+
+      def initialize(server, worker, run_id: nil, ready_wait: nil)
+        @server = server
+        @worker = worker
+        @run_id = run_id
+        @ready_wait = ready_wait
+      end
+
+      def run
+        event_stream.info "worker #{id} ready"
+        if not last_worker?
+          notify if ready_wait
+        end
+      #    event_stream.pub :fin, "server #{server_event} successful"
+      end
+
+      def queue_name
+         @queue_name ||= "#{event_queue}_ready_#{worker.nr + 1}"
+      end
+
+      def id
+        @id ||= worker.nr + 1
+      end
+
+      def notify
+        mq.create
+        msg = mq.nb_writer do |writer|
+          writer.send event
+        end
+      rescue Errno::ENOENT, Errno::EAGAIN, Errno::EACCES => e
+        event_stream.warn "ready event not sent for worker #{id}: #{e.class}"
+      end
+
+      def event
+        run_id ? "ready_#{run_id}" : "ready" 
+      end
+
+      def mq
+        @mq ||= ::Uc::Mqueue.new(queue_name, max_msg: 10, msg_size: 30)
+      end
+
+    end
+  end
+end

data/lib/uc/unicorn/ready_wait.rb

@@ -0,0 +1,58 @@
+require 'uc/mqueue'
+require 'uc/logger'
+require 'uc/unicorn/helper'
+
+module Uc
+  module Unicorn
+    class ReadyWait
+
+      include ::Uc::Logger
+      include ::Uc::Unicorn::Helper
+
+
+      attr_accessor :run_id
+      attr_reader :ready_wait, :server, :worker
+
+
+      def initialize(server, worker, run_id: nil, ready_wait: ready_wait)
+        @server = server
+        @worker = worker
+        @run_id = run_id
+        @ready_wait = ready_wait
+      end
+
+      def run
+        wait if ready_wait
+      end
+
+      def queue_name
+         @queue_name ||= "#{event_queue}_ready_#{worker.nr}"
+      end
+
+      def id
+        @id ||= worker.nr + 1
+      end
+
+      def wait
+        if first_worker?
+          event_stream.debug "no wait for worker #{worker.nr}"
+          return
+        end
+        mq.create
+        msg = mq.wait(event, ready_wait)
+        event_stream.debug "ack worker ready #{worker.nr}"
+      rescue Errno::ENOENT, Errno::EAGAIN, Errno::EACCES, Errno::ETIMEDOUT => e
+        event_stream.warn "ready wait error #{worker.nr}: #{e.class}"
+      end
+
+      def event
+        run_id ? "ready_#{run_id}" : "ready" 
+      end
+
+      def mq
+        @mq ||= ::Uc::Mqueue.new(queue_name, max_msg: 10, msg_size: 30)
+      end
+
+    end
+  end
+end

data/lib/uc/version.rb

@@ -1,3 +1,3 @@
 module Uc
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/patches/unicorn.patch

@@ -0,0 +1,45 @@
+diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb
+index 9406223..3ed9cbd 100644
+--- a/lib/unicorn/configurator.rb
++++ b/lib/unicorn/configurator.rb
+@@ -171,6 +171,10 @@ class Unicorn::Configurator
+     set_hook(:before_exec, block_given? ? block : args[0], 1)
+   end
+ 
++  def on_exec_fail(*args, &block)
++    set_hook(:on_exec_fail, block_given? ? block : args[0], 1)
++  end
++
+   # sets the timeout of worker processes to +seconds+.  Workers
+   # handling the request/app.call/response cycle taking longer than
+   # this time period will be forcibly killed (via SIGKILL).  This
+diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
+index a0ca302..4a1958d 100644
+--- a/lib/unicorn/http_server.rb
++++ b/lib/unicorn/http_server.rb
+@@ -14,6 +14,7 @@ class Unicorn::HttpServer
+   # :stopdoc:
+   attr_accessor :app, :request, :timeout, :worker_processes,
+                 :before_fork, :after_fork, :before_exec,
++                :on_exec_fail, :on_exec_fail_safe,
+                 :listener_opts, :preload_app,
+                 :reexec_pid, :orig_app, :init_listeners,
+                 :master_pid, :config, :ready_pipe, :user
+@@ -408,6 +409,7 @@ class Unicorn::HttpServer
+         self.reexec_pid = 0
+         self.pid = pid.chomp('.oldbin') if pid
+         proc_name 'master'
++        on_exec_fail.call(self)
+       else
+         worker = WORKERS.delete(wpid) and worker.close rescue nil
+         m = "reaped #{status.inspect} worker=#{worker.nr rescue 'unknown'}"
+@@ -810,4 +812,9 @@ class Unicorn::HttpServer
+     raise ArgumentError, "no listeners" if LISTENERS.empty?
+     NEW_LISTENERS.clear
+   end
++
++  def on_exec_fail_safe
++    on_exec_fail.call(self)
++  rescue
++  end
+ end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,19 +66,33 @@ files:
 - README.md
 - Rakefile
 - bin/uc
+- examples/unicorn.rb
 - lib/uc.rb
+- lib/uc/config.rb
+- lib/uc/custom_logger.rb
 - lib/uc/error.rb
+- lib/uc/event.rb
+- lib/uc/event_stream.rb
+- lib/uc/ext/string.rb
 - lib/uc/lock.rb
 - lib/uc/logger.rb
-- lib/uc/mq_logger.rb
 - lib/uc/mqueue.rb
+- lib/uc/paths.rb
 - lib/uc/server.rb
 - lib/uc/shell_helper.rb
+- lib/uc/status.rb
+- lib/uc/templates/unicorn.erb
 - lib/uc/unicorn/api.rb
 - lib/uc/unicorn/config.rb
+- lib/uc/unicorn/gradual_shutdown.rb
+- lib/uc/unicorn/helper.rb
+- lib/uc/unicorn/init.rb
+- lib/uc/unicorn/paths.rb
 - lib/uc/unicorn/prestart.rb
-- lib/uc/unicorn/rolling_restart.rb
+- lib/uc/unicorn/ready_event.rb
+- lib/uc/unicorn/ready_wait.rb
 - lib/uc/version.rb
+- patches/unicorn.patch
 - uc.gemspec
 homepage: ''
 licenses:

data/lib/uc/mq_logger.rb

@@ -1,22 +0,0 @@
-module Uc
-  class MqLogger
-
-    attr_reader :queue_name
-
-    def initialize(queue_name)
-      @queue_name = queue_name
-    end
-
-    def mq
-      @mq ||= ::Uc::Mqueue.new(queue_name)
-    end
-
-    def log(msg)
-      @writer ||= mq.nb_writer
-      @writer.send msg
-    rescue Errno::ENOENT, Errno::EAGAIN, Errno::EACCES, Errno::EMSGSIZE => e
-      puts "#{e.class} #{e.message}"
-    end
-
-  end
-end

data/lib/uc/unicorn/rolling_restart.rb

@@ -1,87 +0,0 @@
-require 'uc/mqueue'
-require 'uc/logger'
-module Uc; module Unicorn
-  class RollingRestart
-
-    include ::Uc::Logger
-    attr_reader :server, :worker, :queue_name, :prestart_wait, :sleep_secs
-    attr_accessor :run_id
-
-    def initialize(server, worker, queue_name, prestart_wait: nil, sleep_secs: 0.1)
-      @server = server
-      @worker = worker
-      @queue_name = queue_name
-      @prestart_wait = prestart_wait
-      @sleep_secs = sleep_secs
-    end
-
-    def run
-      return if not (server && worker)
-      return if not restart?
-
-      destroy_prestart_queues
-      wait_for_prestart_end_event
-      sleep sleep_secs if not first_worker?
-      kill_old_worker
-    end
-
-    private
-
-    def prestart_mq
-      @prestart_mq ||= ::Uc::Mqueue.new(prestart_queue, max_msg: 10, msg_size: 30)
-    end
-
-    def destroy_prestart_queues
-      return if not first_worker?
-      (0..server.worker_processes).each do |i|
-        mq = ::Uc::Mqueue.new("#{queue_name}_prestart_#{i}")
-        mq.destroy
-      end
-    end
- 
-    def prestart_queue
-      first_worker? ? nil : "#{queue_name}_prestart_#{worker.nr - 1}"
-    end
-
-    def wait_for_prestart_end_event
-      return if not prestart_wait
-      if not prestart_queue
-        logger.debug "[rr] no ps wait for #{worker.nr + 1}"
-        return
-      end
-      begin
-        prestart_mq.create
-        msg = prestart_mq.wait( prestart_end_event, prestart_wait)
-        logger.debug "[rr] ps end event #{prestart_end_event} for #{ worker.nr + 1}"
-      rescue => e
-        logger.info "#{e.class} #{e.message}"
-      end
-    end
-
-    def kill_old_worker
-      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-      Process.kill(sig, File.read(old_pid).to_i)
-      mq_log "starting worker #{worker.nr + 1}"
-      mq_log "fin" if sig == :QUIT
-    rescue Errno::ENOENT, Errno::ESRCH, Errno::EAGAIN, Errno::EACCES => e
-      logger.error "rolling restart #{e.class} #{e.message}"
-    end
-
-    def prestart_end_event
-      run_id ? "prestart_end_#{run_id}" : "prestart_end"
-    end
-
-    def restart?
-      old_pid != server.pid
-    end
-
-    def first_worker?
-      worker.nr == 0
-    end
-    
-    def old_pid
-      "#{server.config[:pid]}.oldbin"
-    end
-  
-  end
-end; end