resqued 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd030c6805cad2c45c30a29e5415913b813b6b9
-  data.tar.gz: 997391384ab8db66c4dc1b9fc61efd3b2e9ce556
+  metadata.gz: 2d5c9debc1401bd8eba5b54ea6d6c2f9ad9787ac
+  data.tar.gz: 2dc545b30cdc8a84c5d1264e4ba68126d087d232
 SHA512:
-  metadata.gz: d1d646630aeceb8d1b4915e23d3f5dae31cf06d7aa7bdeca11efa7f5c632345c3e3c42668a49cc204b1a4e1a63df011ec6d399c04f6f26c78281b8818e82826d
-  data.tar.gz: 7c774e66d83c5a8dd5279c2b0c57ce83bdd7cf12f565a48c3d1c50a65b148da0297025606b92443126901cec54ec648ef06635781eba4c5d2e0c97815745968a
+  metadata.gz: 91b94be95c8bc28778f105505e075b56f5f70587a6b51efda99551e8b3503000354d31cc6fa16b10538653c39946a3a51d5c38e336a79dfd87afe9814f18fe31
+  data.tar.gz: 659f8eca03013d49bcaef2641e8dcc7f56d6018b814924f01e5eef362dae9e5d4b05d971adf307739b3b810cf12fb9853e389ee8a08f4775d7dfa2cc4dcbc25f

data/lib/resqued/listener.rb

@@ -57,6 +57,7 @@ module Resqued
     end
 
     SIGNALS = [ :CONT, :QUIT, :INT, :TERM ]
+    ALL_SIGNALS = SIGNALS + [ :CHLD ]
 
     SIGNAL_QUEUE = []
 
@@ -68,6 +69,7 @@ module Resqued
       write_procline('starting')
 
       config = Resqued::Config.new(@config_paths)
+      set_default_resque_logger
       config.before_fork
       report_to_master("RUNNING")
 
@@ -79,6 +81,14 @@ module Resqued
       burn_down_workers(exit_signal || :QUIT)
     end
 
+    # Private.
+    def set_default_resque_logger
+      require 'resque'
+      if Resque.respond_to?('logger=')
+        Resque.logger = Resqued::Logging.build_logger
+      end
+    end
+
     # Private.
     def run_workers_run
       loop do
@@ -102,6 +112,7 @@ module Resqued
     def burn_down_workers(signal)
       loop do
         check_for_expired_workers
+        write_procline('shutdown')
         SIGNAL_QUEUE.clear
 
         break if :no_child == reap_workers(Process::WNOHANG)
@@ -217,6 +228,7 @@ module Resqued
       procline = "#{procline_version} listener"
       procline << " #{@listener_id}" if @listener_id
       procline << " [#{status}]"
+      procline << " [#{running_workers.size} workers]" if status == 'shutdown'
       procline << " #{@config_paths.join(' ')}"
       $0 = procline
     end

data/lib/resqued/logging.rb

@@ -1,9 +1,39 @@
+require 'mono_logger'
+
 module Resqued
   # Mixin for any class that wants to write messages to the log file.
   module Logging
     # Global logging state.
     class << self
-      # Public: Get an IO to write log messages to.
+      # Public: Get a `Logger`.
+      def logger
+        @logger ||= build_logger
+      end
+
+      def build_logger
+        MonoLogger.new(ResquedLoggingIOWrapper.new).tap do |logger|
+          logger.formatter = ResquedLogFormatter.new
+        end
+      end
+
+      class ResquedLogFormatter < ::Logger::Formatter
+        def call(severity, time, progname, msg)
+          "[%s#%6d] %5s %s -- %s\n" % [format_datetime(time), $$, severity, progname, msg2str(msg)]
+        end
+      end
+
+      # Private: Lets our logger reopen its logfile without monologger EVEN KNOWING.
+      class ResquedLoggingIOWrapper
+        def method_missing(*args)
+          ::Resqued::Logging.logging_io.send(*args)
+        end
+
+        def respond_to?(*args)
+          ::Resqued::Logging.logging_io.respond_to?(*args)
+        end
+      end
+
+      # Private: Get an IO to write log messages to.
       def logging_io
         @logging_io = nil if @logging_io && @logging_io.closed?
         @logging_io ||=
@@ -51,8 +81,9 @@ module Resqued
     end
 
     # Private (in classes that include this module)
-    def log(message)
-      Resqued::Logging.logging_io.puts "[#{$$} #{Time.now.strftime('%H:%M:%S')}] #{message}"
+    def log(level, message = nil)
+      level, message = :info, level if message.nil?
+      Resqued::Logging.logger.send(level, self.class.name) { message }
     end
   end
 end

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.2'
+  VERSION = '0.7.4'
 end

data/lib/resqued/worker.rb

@@ -57,25 +57,13 @@ module Resqued
       @killed = false
       if @pid = fork
         # still in the listener
+        log "Forked worker #{@pid}"
       else
         # In case we get a signal before resque is ready for it.
-        [:QUIT, :TERM, :INT].each { |signal| trap(signal) { exit 1 } }
+        Resqued::Listener::ALL_SIGNALS.each { |signal| trap(signal, 'DEFAULT') }
+        trap(:QUIT) { exit! 0 } # If we get a QUIT during boot, just spin back down.
         $0 = "STARTING RESQUE FOR #{queues.join(',')}"
-        if Resque.respond_to?("logger")
-          Resque.logger.level = Logger::INFO
-          Resque.logger.formatter = Resque::VerboseFormatter.new
-        end
-        if ! log_to_stdout?
-          lf = Resqued::Logging.logging_io
-          if Resque.respond_to?("logger=")
-            Resque.logger = Resque.logger.class.new(lf)
-          else
-            $stdout.reopen(lf)
-            lf.close
-          end
-        end
         resque_worker = Resque::Worker.new(*queues)
-        resque_worker.log "Starting worker #{resque_worker}"
         resque_worker.term_child = true if resque_worker.respond_to?('term_child=')
         Resque.redis.client.reconnect
         @config.after_fork(resque_worker)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement