later 0.1.0 → 0.1.1

data/later.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'redis'
   gem.add_dependency 'nest'
+  gem.add_dependency 'json'
 
   gem.add_development_dependency 'minitest'
 end

data/lib/later.rb

@@ -1,13 +1,10 @@
 require 'later/version'
 require 'redis'
 require 'nest'
+require 'json'
 
 module Later
   class Schedule
-    def key
-      @key
-    end
-
     def initialize(key)
       if key.is_a?(Nest)
         @key = key
@@ -16,6 +13,14 @@ module Later
       end
     end
 
+    def key
+      @key
+    end
+
+    def exceptions
+      @exceptions ||= key[:exceptions]
+    end
+
     def [](event)
       Time.at key[:schedule].zscore(event) rescue nil
     end
@@ -44,24 +49,42 @@ module Later
 
         time = Time.now.to_i
 
-        key[:schedule].redis.multi
-        key[:schedule].zrangebyscore '-inf', time
-        key[:schedule].zremrangebyscore '-inf', time
-        ids = key[:schedule].redis.exec.first
+        schedule.redis.multi
+        schedule.zrangebyscore '-inf', time
+        schedule.zremrangebyscore '-inf', time
+        ids = schedule.redis.exec.first
 
-        key.redis.pipelined do
-          ids.each do |id|
-            key[:queue].lpush id
-          end
-        end
+        key.redis.multi
+        ids.each { |id| queue.lpush id }
+        key.redis.exec
 
-        event = key[:queue].brpoplpush(key[:now], 1)
+        event = queue.brpoplpush(backup, 1)
 
         next unless event
 
-        block.call event
+        begin
+          block.call event
+        rescue Exception => e
+          exceptions.rpush JSON(time: Time.now, event: event, message: e.inspect)
+        ensure
+          backup.del
+        end
       end
     end
+
+    protected
+
+    def schedule
+      @schedule ||= key[:schedule]
+    end
+
+    def queue
+      @queue ||= key[:queue]
+    end
+
+    def backup
+      @backup ||= queue[Socket.gethostname][Process.pid]
+    end
   end
 
   @schedules = {}

data/lib/later/version.rb

@@ -1,3 +1,3 @@
 module Later
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/helper.rb

@@ -6,12 +6,12 @@ class MiniTest::Unit::TestCase
   def setup
     system 'redis-server', File.join(File.dirname(__FILE__), 'redis.conf')
     until File.exist? 'redis.pid'
-      sleep 1
+      sleep 0.1
     end
   end
 
   def teardown
     system "kill `cat redis.pid`"
-    sleep 1
+    sleep 0.1
   end
 end

data/test/lib/later.rb

@@ -30,25 +30,25 @@ class LaterTest < MiniTest::Unit::TestCase
   def test_count_set_and_unset_event_schedules
     time = Time.now
 
-    1.upto(10) do |i|
+    1.upto(3) do |i|
       Later[@key].set i.to_s, time
       assert_equal i, Later[@key].count
     end
 
-    1.upto(10) do |i|
+    1.upto(3) do |i|
       Later[@key].unset i.to_s
-      assert_equal 10 - i, Later[@key].count
+      assert_equal 3 - i, Later[@key].count
     end
   end
 
   def test_process_many_event_schedules
-    start = Time.now + 20
+    start = Time.now + 2
 
     times = []
     schedules = Hash.new { |h,k| h[k] = [] }
 
-    1.upto(1000) do |i|
-      time = start + i / 100
+    1.upto(100) do |i|
+      time = start + i / 10
       times.unshift time
       schedules[time].unshift event: i.to_s, time: time
     end
@@ -58,7 +58,7 @@ class LaterTest < MiniTest::Unit::TestCase
     end
 
     Thread.new do
-      sleep 30
+      sleep 2 + 10 + (start - Time.now).to_i
       Later[@key].stop
     end
 
@@ -71,4 +71,33 @@ class LaterTest < MiniTest::Unit::TestCase
 
     assert_equal 0, Later[@key].count
   end
+
+  def test_exceptions_raised_within_the_worker_loop_are_handled_and_logged
+    start = Time.now + 2
+
+    1.upto(3) do |i|
+      Later[@key].set i.to_s, start + i
+    end
+
+    Thread.new do
+      sleep 2 + 3 + (start - Time.now).to_i
+      Later[@key].stop
+    end
+
+    Later[@key].each do |event|
+      raise Exception, "an unknown error for #{event} has occurred"
+    end
+
+    assert_equal 0, Later[@key].count
+
+    exceptions = Later[@key].exceptions.lrange 0, -1
+    exceptions = exceptions.map{ |e| JSON(e) }
+
+    assert_equal '1', exceptions[0]['event']
+    assert_equal '#<Exception: an unknown error for 1 has occurred>', exceptions[0]['message']
+    assert_equal '2', exceptions[1]['event']
+    assert_equal '#<Exception: an unknown error for 2 has occurred>', exceptions[1]['message']
+    assert_equal '3', exceptions[2]['event']
+    assert_equal '#<Exception: an unknown error for 3 has occurred>', exceptions[2]['message']
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: later
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement