perfectqueue 0.8.40 → 0.8.41

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3193b8f7bd75661b9fe9c30b9cdadccebf0c2fbe
+  data.tar.gz: 86ec5d98cbe5a15dcf94093f607d3e91a68bbb2b
+SHA512:
+  metadata.gz: 0fbc35db6a9eddba6873d1be42bc3d422e614936960930c641edd4cc57046c6b2b3636c13e183b15046db5b6f4ef00befa956c911134e94f6c2f9c8f03f03463
+  data.tar.gz: eb8db4f5259f780807b79387a0c5b7ab2904a5e300ff0a63d461fdf93691d43282c2f30f15bdd71edbc3a41c2d7ff993aa735ffe1667474e6da4d77b6d301fc1

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2
+  - ruby-head
+
+script: "bundle exec rake spec"

data/ChangeLog

@@ -1,3 +1,10 @@
+== 2015-04-27 version 0.8.41
+
+* ruby >= 2.0.0 support.
+  SignalQueue is obsolete because it does not run with ruby >= 2.0.0.
+  See ddbf04c9 and use SignalThread instead.
+
+
 == 2014-10-08 version 0.8.40
 
 * upgraded sequel v3.48.0

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -1,5 +1,7 @@
 # PerfectQueue
 
+[![Build Status](https://travis-ci.org/treasure-data/perfectqueue.svg?branch=master)](https://travis-ci.org/treasure-data/perfectqueue)
+
 PerfectQueue is a highly available distributed queue built on top of RDBMS.
 PerfectQueue provides similar API to Amazon SQS, while PerfectQueue focues on reliability and flexible scheduling rather than scalability.
 

data/lib/perfectqueue/multiprocess/child_process.rb

@@ -95,36 +95,37 @@ module PerfectQueue
 
       private
       def install_signal_handlers
-        SignalQueue.start do |sig|
-          sig.trap :TERM do
-            stop(false)
+        s = self
+        SignalThread.new do |st|
+          st.trap :TERM do
+            s.stop(false)
           end
-          sig.trap :INT do
-            stop(false)
+          st.trap :INT do
+            s.stop(false)
           end
 
-          sig.trap :QUIT do
-            stop(true)
+          st.trap :QUIT do
+            s.stop(true)
           end
 
-          sig.trap :USR1 do
-            stop(false)
+          st.trap :USR1 do
+            s.stop(false)
           end
 
-          sig.trap :HUP do
-            stop(true)
+          st.trap :HUP do
+            s.stop(true)
           end
 
-          sig.trap :CONT do
-            stop(false)
+          st.trap :CONT do
+            s.stop(false)
           end
 
-          sig.trap :WINCH do
-            stop(true)
+          st.trap :WINCH do
+            s.stop(true)
           end
 
-          sig.trap :USR2 do
-            logrotated
+          st.trap :USR2 do
+            s.logrotated
           end
 
           trap :CHLD, "SIG_DFL"

data/lib/perfectqueue/signal_queue.rb

@@ -18,6 +18,8 @@
 
 module PerfectQueue
 
+  # SignalQueue is obsolete because it does not run with ruby >= 2.0.0.
+  # See ddbf04c9 and use SignalThread instead.
   class SignalQueue
     def self.start(&block)
       st = new(&block)

data/lib/perfectqueue/signal_thread.rb

@@ -0,0 +1,127 @@
+#
+# PerfectQueue
+#
+# Copyright (C) 2012-2013 Sadayuki Furuhashi
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module PerfectQueue
+
+  class SignalThread < Thread
+    def initialize(&block)
+      require 'thread'
+
+      @handlers = {}
+
+      @mutex = Mutex.new
+      @cond = ConditionVariable.new
+      @queue = []
+      @finished = false
+
+      block.call(self) if block
+
+      super(&method(:main))
+    end
+
+    def trap(sig, command=nil, &block)
+      # normalize signal names
+      sig = sig.to_s.upcase
+      if sig[0,3] == "SIG"
+        sig = sig[3..-1]
+      end
+      sig = sig.to_sym
+
+      old = @handlers[sig]
+      if block
+        Kernel.trap(sig) { signal_handler_main(sig) }
+        @handlers[sig] = block
+      else
+        Kernel.trap(sig, command)
+        @handlers.delete(sig)
+      end
+
+      old
+    end
+
+    def handlers
+      @handlers.dup
+    end
+
+    def stop
+      @mutex.synchronize do
+        @finished = true
+        @cond.broadcast
+      end
+      self
+    end
+
+    private
+
+    def signal_handler_main(sig)
+      # here always creates new thread to avoid
+      # complicated race condition in signal handlers
+      Thread.new do
+        begin
+          enqueue(sig)
+        rescue => e
+          STDERR.print "#{e}\n"
+          e.backtrace.each do |bt|
+            STDERR.print "\t#{bt}\n"
+            STDERR.flush
+          end
+        end
+      end
+
+    end
+
+    def main
+      until @finished
+        sig = nil
+
+        @mutex.synchronize do
+          while true
+            return if @finished
+
+            sig = @queue.shift
+            break if sig
+
+            @cond.wait(@mutex, 1)
+          end
+        end
+
+        begin
+          @handlers[sig].call(sig)
+        rescue => e
+          STDERR.print "#{e}\n"
+          e.backtrace.each do |bt|
+            STDERR.print "\t#{bt}\n"
+            STDERR.flush
+          end
+        end
+      end
+
+      nil
+
+    ensure
+      @finished = false
+    end
+
+    def enqueue(sig)
+      @mutex.synchronize do
+        @queue << sig
+        @cond.broadcast
+      end
+    end
+
+  end
+end

data/lib/perfectqueue/supervisor.rb

@@ -141,28 +141,29 @@ module PerfectQueue
     end
 
     def install_signal_handlers(&block)
-      sig = SignalQueue.start do |sig|
-        sig.trap :TERM do
-          stop(false)
+      s = self
+      st = SignalThread.new do |st|
+        st.trap :TERM do
+          s.stop(false)
         end
-        sig.trap :INT do
-          stop(false)
+        st.trap :INT do
+          s.stop(false)
         end
 
-        sig.trap :QUIT do
-          stop(true)
+        st.trap :QUIT do
+          s.stop(true)
         end
 
-        sig.trap :USR1 do
-          restart(false)
+        st.trap :USR1 do
+          s.restart(false)
         end
 
-        sig.trap :HUP do
-          restart(true)
+        st.trap :HUP do
+          s.restart(true)
         end
 
-        sig.trap :USR2 do
-          logrotated
+        st.trap :USR2 do
+          s.logrotated
         end
 
         trap :CHLD, "SIG_IGN"
@@ -171,7 +172,7 @@ module PerfectQueue
       begin
         block.call
       ensure
-        sig.shutdown
+        st.stop
       end
     end
   end

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.40"
+  VERSION = "0.8.41"
 end

data/lib/perfectqueue/worker.rb

@@ -99,30 +99,31 @@ module PerfectQueue
     end
 
     def install_signal_handlers
-      SignalQueue.start do |sig|
-        sig.trap :TERM do
-          stop(false)
+      s = self
+      SignalThread.new do |st|
+        st.trap :TERM do
+          s.stop(false)
         end
 
         # override
-        sig.trap :INT do
-          detach
+        st.trap :INT do
+          s.detach
         end
 
-        sig.trap :QUIT do
-          stop(true)
+        st.trap :QUIT do
+          s.stop(true)
         end
 
-        sig.trap :USR1 do
-          restart(false)
+        st.trap :USR1 do
+          s.restart(false)
         end
 
-        sig.trap :HUP do
-          restart(true)
+        st.trap :HUP do
+          s.restart(true)
         end
 
-        sig.trap :USR2 do
-          logrotated
+        st.trap :USR2 do
+          s.logrotated
         end
       end
     end

data/lib/perfectqueue.rb

@@ -40,7 +40,10 @@ module PerfectQueue
     :TaskStatus => 'perfectqueue/task_status',
     :Worker => 'perfectqueue/worker',
     :Supervisor => 'perfectqueue/supervisor',
+    # SignalQueue is obsolete because it does not run with ruby >= 2.0.0.
+    # See ddbf04c9 and use SignalThread instead.
     :SignalQueue => 'perfectqueue/signal_queue',
+    :SignalThread => 'perfectqueue/signal_thread',
     :VERSION => 'perfectqueue/version',
   }.each_pair {|k,v|
     autoload k, File.expand_path(v, File.dirname(__FILE__))

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.40
-  prerelease: 
+  version: 0.8.41
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.48.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.48.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 description: Highly available distributed cron built on RDBMS
@@ -98,7 +87,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - LICENSE
@@ -129,6 +119,7 @@ files:
 - lib/perfectqueue/queue.rb
 - lib/perfectqueue/runner.rb
 - lib/perfectqueue/signal_queue.rb
+- lib/perfectqueue/signal_thread.rb
 - lib/perfectqueue/supervisor.rb
 - lib/perfectqueue/task.rb
 - lib/perfectqueue/task_metadata.rb
@@ -145,33 +136,26 @@ files:
 homepage: https://github.com/treasure-data/perfectqueue
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2104551173355811922
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2104551173355811922
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Highly available distributed cron built on RDBMS
 test_files:
 - spec/queue_spec.rb
@@ -179,3 +163,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/stress.rb
 - spec/supervisor_spec.rb
+has_rdoc: false