nsque 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17ba7b6c118b685821a2d40015f99a65e74fcaa9
-  data.tar.gz: 082b3a799e7b6de3ca1571b542e6b4aab44afe05
+  metadata.gz: 10c1646bd342cfa399501357e129b2f1d09bffb3
+  data.tar.gz: 89d400c7cda79d472a419ef0e8cbad40561ef84d
 SHA512:
-  metadata.gz: 4c0487e18a839a5eb12a92fed01827f65e3874b68b3447e99ed86d3b4029387cf334b8ac5dbc6840d3182c703910bb75ae3a20ae52531c490776c4d17319653a
-  data.tar.gz: 9038a8545cc9465ce5aefcbfe61f02577aeeb7f7e4ac848f9c1d4893fcb46c8af105d3f20220cce88dca4d98e95f4260840a4b036a6b1cb5d1f462007f4fbe7c
+  metadata.gz: 7c67c3da80194460899e2eef2554409e5e2c07024e8ce6850ebc130baee0c703bd96b58f7e8cf7209056dababb302abc233045f97d552f3799f1f7c5f40262f4
+  data.tar.gz: facf3aa916dc619e57a9b131cc09eed8b300cb8bce970d59d3a1dafad55d448d10511f11d9c29bb794d64aa9d979dfcb14d6cf736d820a4d1f4177d331f884e1

data/lib/nsque/testing_worker.rb

@@ -4,8 +4,8 @@ module Nsque
 
     def initialize(options)
       raise ChannelRequiredError.new unless options.has_key?(:channel)
-      @options = options
       raise ProducerCantBeNilError.new if options[:producer].nil?
+      @options = options
       @producer = options[:producer]
       @consumer = Krakow::Consumer.new(@options)
     end

data/lib/nsque/version.rb

@@ -1,3 +1,3 @@
 module Nsque
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/nsque/worker.rb

@@ -9,17 +9,24 @@ module Nsque
 
     def run
       consumer = Krakow::Consumer.new(@options)
+      initialize_traps
+
       loop do
-        message = consumer.queue.pop
+        begin
+          message = Timeout::timeout(1) { consumer.queue.pop }
+        rescue Timeout::Error
+          break if @shutdown
+          next if message.nil?
+        end
         begin
           hash = JSON.parse(message.message)
-          p hash.inspect
+          puts hash.inspect
           enqueue_after = (hash['at'].to_f - Time.now.to_f) * 1000
           if enqueue_after <= 0
             klass = hash['class'].constantize
             klass.new.perform(hash['args'])
           else
-            p "Requeued: #{enqueue_after} ms"
+            puts "Requeued: #{enqueue_after} ms"
             consumer.requeue(message, enqueue_after.to_i)
             next
           end
@@ -27,9 +34,21 @@ module Nsque
           p e.message
         end
         consumer.confirm(message)
+        break if @shutdown
       end
     ensure
       consumer.terminate if consumer
     end
+
+    private
+
+      def initialize_traps
+        %w(INT TERM).each do |signal|
+          trap(signal) do
+            puts "I've recieved #{signal}!"
+            @shutdown = true
+          end
+        end
+      end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsque
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mikhail Salosin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krakow