sidekiq 2.7.4 → 2.7.5

data/Changes.md

@@ -1,3 +1,10 @@
+2.7.5
+-----------
+
+- Capistrano no longer uses daemonization in order to work with JRuby [#719]
+- Refactor signal handling to work on Ruby 2.0 [#728, #730]
+- Fix dashboard refresh URL [#732]
+
 2.7.4
 -----------
 

data/lib/sidekiq/capistrano.rb

@@ -36,7 +36,7 @@ Capistrano::Configuration.instance.load do
     task :start, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
       rails_env = fetch(:rails_env, "production")
       for_each_process do |pid_file, idx|
-        run "cd #{current_path} ; #{fetch(:sidekiq_cmd)} -d -e #{rails_env} -C #{current_path}/config/sidekiq.yml -i #{idx} -P #{pid_file} -L #{current_path}/log/sidekiq.log", :pty => false
+        run "cd #{current_path} ; nohup #{fetch(:sidekiq_cmd)} -e #{rails_env} -C #{current_path}/config/sidekiq.yml -i #{idx} -P #{pid_file} >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
       end
     end
 

data/lib/sidekiq/cli.rb

@@ -1,42 +1,11 @@
-trap 'INT' do
-  if Sidekiq.options[:profile]
-    result = RubyProf.stop
-    printer = RubyProf::GraphHtmlPrinter.new(result)
-    File.open("profile.html", 'w') do |f|
-      printer.print(f, :min_percent => 1)
-    end
-  end
-  # Handle Ctrl-C in JRuby like MRI
-  # http://jira.codehaus.org/browse/JRUBY-4637
-  Sidekiq::CLI.instance.interrupt
-end
-
-trap 'TERM' do
-  # Heroku sends TERM and then waits 10 seconds for process to exit.
-  Sidekiq::CLI.instance.interrupt
-end
-
-trap 'USR1' do
-  Sidekiq.logger.info "Received USR1, no longer accepting new work"
-  mgr = Sidekiq::CLI.instance.launcher.manager
-  mgr.async.stop if mgr
-end
-
-trap 'USR2' do
-  if Sidekiq.options[:logfile]
-    Sidekiq.logger.info "Received USR2, reopening log file"
-    Sidekiq::Logging.initialize_logger(Sidekiq.options[:logfile])
-  end
-end
-
-trap 'TTIN' do
-  Thread.list.each do |thread|
-    Sidekiq.logger.info "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
-    if thread.backtrace
-      Sidekiq.logger.info thread.backtrace.join("\n")
-    else
-      Sidekiq.logger.info "<no backtrace available>"
-    end
+$sidekiq_signals = []
+
+# Signal handlers should do as little as humanly possible
+# and defer all work to a non-trap context.  We'll have
+# the main thread poll for signals and handle them there.
+%w(INT TERM USR1 USR2 TTIN).each do |sig|
+  trap sig do
+    $sidekiq_signals << sig
   end
 end
 
@@ -99,7 +68,11 @@ module Sidekiq
           RubyProf.start
         end
         launcher.run
-        sleep
+
+        while true
+          handle_signals
+          sleep 1
+        end
       rescue Interrupt
         logger.info 'Shutting down'
         launcher.stop
@@ -109,11 +82,41 @@ module Sidekiq
       end
     end
 
-    def interrupt
-      @interrupt_mutex.synchronize do
-        unless @interrupted
-          @interrupted = true
-          Thread.main.raise Interrupt
+    def handle_signals
+      while sig = $sidekiq_signals.shift
+        Sidekiq.logger.debug "Got #{sig} signal"
+        case sig
+        when 'INT'
+          if Sidekiq.options[:profile]
+            result = RubyProf.stop
+            printer = RubyProf::GraphHtmlPrinter.new(result)
+            File.open("profile.html", 'w') do |f|
+              printer.print(f, :min_percent => 1)
+            end
+          end
+          # Handle Ctrl-C in JRuby like MRI
+          # http://jira.codehaus.org/browse/JRUBY-4637
+          raise Interrupt
+        when 'TERM'
+          # Heroku sends TERM and then waits 10 seconds for process to exit.
+          raise Interrupt
+        when 'USR1'
+          Sidekiq.logger.info "Received USR1, no longer accepting new work"
+          launcher.manager.async.stop
+        when 'USR2'
+          if Sidekiq.options[:logfile]
+            Sidekiq.logger.info "Received USR2, reopening log file"
+            Sidekiq::Logging.initialize_logger(Sidekiq.options[:logfile])
+          end
+        when 'TTIN'
+          Thread.list.each do |thread|
+            Sidekiq.logger.info "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
+            if thread.backtrace
+              Sidekiq.logger.info thread.backtrace.join("\n")
+            else
+              Sidekiq.logger.info "<no backtrace available>"
+            end
+          end
         end
       end
     end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.7.4"
+  VERSION = "2.7.5"
 end

data/web/views/dashboard.slim

@@ -11,11 +11,11 @@ h5 Real-time
 
 h5
   span.history-heading History
-  a href="#{{current_path}}?days=7" class="history-graph #{{"active" if params[:days] == "7"}}" 1 week
-  a href="#{{current_path}}" class="history-graph #{{"active" if params[:days].nil? || params[:days] == "30"}}" 1 month
-  a href="#{{current_path}}?days=90" class="history-graph #{{"active" if params[:days] == "90"}}" 3 month
-  a href="#{{current_path}}?days=180" class="history-graph #{{"active" if params[:days] == "180"}}" 6 month
-#history data-processed="#{Sidekiq.dump_json(@processed_history)}" data-failed="#{Sidekiq.dump_json(@failed_history)}" data-update-url="#{{current_path}}dashboard/stats"
+  a href="#{{root_path}}?days=7" class="history-graph #{{"active" if params[:days] == "7"}}" 1 week
+  a href="#{{root_path}}" class="history-graph #{{"active" if params[:days].nil? || params[:days] == "30"}}" 1 month
+  a href="#{{root_path}}?days=90" class="history-graph #{{"active" if params[:days] == "90"}}" 3 month
+  a href="#{{root_path}}?days=180" class="history-graph #{{"active" if params[:days] == "180"}}" 6 month
+#history data-processed="#{Sidekiq.dump_json(@processed_history)}" data-failed="#{Sidekiq.dump_json(@failed_history)}" data-update-url="#{{root_path}}dashboard/stats"
 
 br
 h5 Redis

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - .public_cert.pem
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis