stalking 0.0.1 → 0.0.2

data/lib/stalking/consumer.rb

@@ -30,61 +30,37 @@ module Stalking
     private
 
     def work
-      setup
+      loop do
+        job = connection.reserve
 
-      begin
-        loop do
-          job = connection.reserve
+        name, args = JSON.parse(job.body)
 
-          exit if @quit
+        if handler = @handlers.job_handlers[name]
+          begin
+            Timeout::timeout(job.ttr - 1) do
+              handle @handlers.before_handlers, name, args
 
-          busy do
-            name, args = JSON.parse(job.body)
+              handler.call args
 
-            if handler = @handlers.job_handlers[name]
-              begin
-                Timeout::timeout(job.ttr - 1) do
-                  handle @handlers.before_handlers, name, args
-
-                  handler.call args
-
-                  handle @handlers.after_handlers, name, args
-                end
-              rescue Beanstalk::NotConnected => e
-                raise e # Re-raise
-              rescue Timeout::Error, StandardError => e
-                handle_error e, name, args
-              end
+              handle @handlers.after_handlers, name, args
             end
+          rescue Beanstalk::NotConnected => e
+            raise e # Re-raise
+          rescue Timeout::Error, StandardError => e
+            handle_error e, name, args
           end
-
-          job.delete
         end
-      rescue Beanstalk::NotConnected => e
-        log_error e
-
-        sleep 1
 
-        reconnect
-
-        retry
+        job.delete
       end
-    end
-
-    def setup
-      trap "QUIT" do
-        exit unless @busy
+    rescue Beanstalk::NotConnected => e
+      log_error e
 
-        @quit = true
-      end
-    end
+      sleep 1
 
-    def busy
-      @busy = true
+      reconnect
 
-      yield
-    ensure
-      @busy = false
+      retry
     end
 
     def connect

data/lib/stalking/version.rb

@@ -1,3 +1,3 @@
 module Stalking
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/stalking/consumer_test.rb

@@ -96,6 +96,10 @@ class Stalking::ConsumerTest < Test::Unit::TestCase
     assert_equal ["test", { "a" => "b" }], res
   end
 
+  def test_watch
+    # Already tested
+  end
+
   def test_work
     Stalking::Producer.new.enqueue "test1", "a" => "b"
     Stalking::Producer.new.enqueue "test2", "a" => "b"
@@ -124,10 +128,6 @@ class Stalking::ConsumerTest < Test::Unit::TestCase
     assert_equal ["test1", "test2", "test3"], res
   end
 
-  def test_quit
-    raise NotImplementedError
-  end
-
   def test_job_not_deleted
     Stalking::Producer.new.enqueue "test", "a" => "b"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stalking
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: