girl_friday 0.9.7 → 0.10.0

data/History.md

@@ -1,6 +1,12 @@
 Changes
 ================
 
+0.10.0
+---------
+
+* Update connection_pool to latest
+* Handle shutdown more gracefully, wait for work to be finished
+
 0.9.7
 ---------
 

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Mike Perham
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -77,7 +77,7 @@ From wikipedia:
 Thanks
 --------------------
 
-[Carbon Five](http://carbonfive.com), I write and maintain girl\_friday on their clock.
+[Carbon Five](http://carbonfive.com), I wrote and maintained girl\_friday on their clock.
 
 This gem contains a copy of the Rubinius Actor API, modified to work on any Ruby VM.  Thanks to Evan Phoenix, MenTaLguY and the Rubinius project for permission to use and distribute this code.
 

data/girl_friday.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency              'connection_pool', '~> 0.1.0'
+  s.add_dependency              'connection_pool', '~> 0.9.0'
   s.add_development_dependency  'sinatra', '~> 1.3'
   s.add_development_dependency  'rake'
 end

data/lib/girl_friday/version.rb

@@ -1,3 +1,3 @@
 module GirlFriday
-  VERSION = "0.9.7"
+  VERSION = "0.10.0"
 end

data/lib/girl_friday/work_queue.rb

@@ -14,6 +14,7 @@ module GirlFriday
       @error_handlers = (Array(options[:error_handler] || ErrorHandler.default)).map(&:new)
 
       @shutdown = false
+      @shutting_down = false
       @busy_workers = []
       @ready_workers = nil
       @created_at = Time.now.to_i
@@ -76,6 +77,10 @@ module GirlFriday
       @supervisor << Shutdown[block]
     end
 
+    def working?
+      @busy_workers.size > 0
+    end
+
     private
 
     def running?
@@ -89,7 +94,7 @@ module GirlFriday
 
     def on_ready(who)
       @total_processed += 1
-      if running? && work = @persister.pop
+      if !shutting_down? && running? && work = @persister.pop
         who.this << work
         drain
       else
@@ -108,10 +113,13 @@ module GirlFriday
       end
     end
 
+    def shutting_down?
+      !!@shutting_down
+    end
+
     def on_work(work)
       @total_queued += 1
-
-      if running? && worker = ready_workers.pop
+      if !shutting_down? && running? && worker = ready_workers.pop
         @busy_workers << worker
         worker << work
         drain
@@ -174,13 +182,19 @@ module GirlFriday
             on_work(work)
           end
           f.when(Shutdown) do |stop|
-            @shutdown = true
-            @when_shutdown = stop.callback
-            @busy_workers.each { |w| w << stop }
-            ready_workers.each { |w| w << stop }
-            shutdown_complete
-            GirlFriday.remove_queue @weakref
-            return
+            @shutting_down = true
+            if !working?
+              @shutdown = true
+              @when_shutdown = stop.callback
+              @busy_workers.each { |w| w << stop }
+              ready_workers.each { |w| w << stop }
+              shutdown_complete
+              GirlFriday.remove_queue @weakref
+              return
+            else
+              Thread.pass
+              shutdown(&stop.callback)
+            end
           end
           f.when(Actor::DeadActorError) do |ex|
             if running?
@@ -189,6 +203,7 @@ module GirlFriday
               @busy_workers.delete(ex.actor)
               ready_workers << Actor.spawn_link(&@work_loop)
               handle_error(ex.reason)
+              drain
             end
           end
         end

data/test/test_girl_friday_queue.rb

@@ -36,6 +36,25 @@ class TestGirlFridayQueue < MiniTest::Unit::TestCase
     end
   end
 
+  def test_should_handle_worker_error_with_retry
+    async_test do |cb|
+      TestErrorHandler.send(:define_method, :handle) do |ex|
+      end
+
+      queue = GirlFriday::WorkQueue.new('error', :error_handler => TestErrorHandler, :size => 1) do |msg|
+        begin
+          raise 'oops' if msg == 1
+          queue.shutdown do
+            cb.call
+          end
+        ensure
+          queue.push(0)
+        end
+      end
+      queue.push(1)
+    end
+  end
+
   def test_should_use_a_default_error_handler_when_none_specified
     async_test do |cb|
       queue = GirlFriday::WorkQueue.new('error') do |msg|
@@ -106,7 +125,7 @@ class TestGirlFridayQueue < MiniTest::Unit::TestCase
       require 'redis'
       require 'connection_pool'
       pool = ConnectionPool.new(:size => 5, :timeout => 2){ Redis.new }
-      pool.flushdb
+      pool.with_connection {|redis| redis.flushdb }
     rescue LoadError
       return puts "Skipping redis test, 'redis' gem not found: #{$!.message}"
     rescue Errno::ECONNREFUSED
@@ -170,6 +189,32 @@ class TestGirlFridayQueue < MiniTest::Unit::TestCase
     end
   end
 
+  def test_should_allow_in_progress_work_to_finish
+    mutex = Mutex.new
+    total = 8
+    count = 0
+    incr = Proc.new do
+      mutex.synchronize do
+        count += 1
+      end
+    end
+
+    async_test(10) do |cb|
+      queue = GirlFriday::WorkQueue.new('finish', :size => 10) do |msg|
+        sleep 1
+        incr.call
+      end
+      total.times do
+        queue.push(:text => 'foo')
+      end
+
+      GirlFriday.shutdown!
+      assert_equal total, queue.instance_variable_get("@total_processed")
+      assert_equal total, count
+      cb.call
+    end
+  end
+
   def test_should_create_workers_lazily
     async_test do |cb|
       queue = GirlFriday::Queue.new('lazy', :size => 2) do |msg|

metadata

@@ -2,47 +2,46 @@
 name: girl_friday
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 -08:00
-default_executable:
+date: 2012-08-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  version_requirements: &2078 !ruby/object:Gem::Requirement
+  version_requirements: &2056 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.9.0
     none: false
-  requirement: *2078
+  requirement: *2056
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: &2096 !ruby/object:Gem::Requirement
+  version_requirements: &2074 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
     none: false
-  requirement: *2096
+  requirement: *2074
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &2114 !ruby/object:Gem::Requirement
+  version_requirements: &2092 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  requirement: *2114
+  requirement: *2092
   prerelease: false
   type: :development
 description: Background processing, simplified
@@ -57,9 +56,9 @@ files:
 - .travis.yml
 - Gemfile
 - History.md
+- LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - config.ru
 - examples/backends/mongo_persistence.rb
 - examples/backends/using_mongo.rb
@@ -84,7 +83,6 @@ files:
 - test/test_girl_friday.rb
 - test/test_girl_friday_immediately.rb
 - test/test_girl_friday_queue.rb
-has_rdoc: true
 homepage: http://github.com/mperham/girl_friday
 licenses: []
 post_install_message:
@@ -105,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project: girl_friday
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key:
 specification_version: 3
 summary: Background processing, simplified

data/TODO.md

@@ -1,5 +0,0 @@
-TODO
-==============
-
- - rufus-scheduler integration for scheduled tasks
- - web admin UI to surface status() metrics