stalking 0.0.2 → 0.0.4

data/README.md

@@ -177,6 +177,11 @@ Stalking::Consumer.new :logger => ...
 You can hand out any kind of logging object, which responds to an `error`
 method and takes a string error message.
 
+# Graceful termination
+
+To stop your workers gracefully, send a USR1 signal to them. The worker will
+finish its current job and terminate afterwards.
+
 ## Contributing
 
 1. Fork it

data/lib/stalking/consumer.rb

@@ -30,28 +30,30 @@ module Stalking
     private
 
     def work
-      loop do
+      looping do
         job = connection.reserve
 
-        name, args = JSON.parse(job.body)
+        lock do
+          name, args = JSON.parse(job.body)
 
-        if handler = @handlers.job_handlers[name]
-          begin
-            Timeout::timeout(job.ttr - 1) do
-              handle @handlers.before_handlers, name, args
+          if handler = @handlers.job_handlers[name]
+            begin
+              Timeout::timeout(job.ttr - 1) do
+                handle @handlers.before_handlers, name, args
 
-              handler.call args
+                handler.call args
 
-              handle @handlers.after_handlers, name, 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
-          rescue Beanstalk::NotConnected => e
-            raise e # Re-raise
-          rescue Timeout::Error, StandardError => e
-            handle_error e, name, args
           end
-        end
 
-        job.delete
+          job.delete
+        end
       end
     rescue Beanstalk::NotConnected => e
       log_error e
@@ -63,6 +65,28 @@ module Stalking
       retry
     end
 
+    def looping
+      continue = true
+
+      trap "USR1" do
+        exit unless @locked
+
+        continue = false
+      end
+
+      while continue
+        yield
+      end
+    end
+
+    def lock
+      @locked = true
+
+      yield
+    ensure
+      @locked = false
+    end
+
     def connect
       @connection ||= Beanstalk::Pool.new(@servers)
 

data/lib/stalking/version.rb

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

data/test/stalking/consumer_test.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 
 require "stalking"
 require "test/unit"
+require "timeout"
 
 require File.expand_path("../beanstalk", __FILE__)
 require File.expand_path("../test_logger", __FILE__)
@@ -179,7 +180,7 @@ class Stalking::ConsumerTest < Test::Unit::TestCase
     res = []
 
     exception = assert_raises(Exception) do
-      Stalking::Consumer.new(:logger => logger) do
+      Stalking::Consumer.new :logger => logger do
         job "test" do |args|
           if res.empty?
             res.push ["down"]
@@ -204,5 +205,19 @@ class Stalking::ConsumerTest < Test::Unit::TestCase
   def test_logger
     # Already tested
   end
+
+  def test_termination
+    assert_nothing_raised do
+      Timeout::timeout 3 do
+        consumer = Stalking::Consumer.new
+
+        consumer.send :looping do
+          consumer.send :lock do # Don't invoke exit
+            Process.kill "USR1", Process.pid
+          end
+        end
+      end
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stalking
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake