blaxter-delayed_job 2.1.6 → 2.1.8

data/VERSION

@@ -1 +1 @@
-2.1.6
+2.1.8

data/lib/delayed/job_launcher.rb

@@ -34,21 +34,25 @@ module Delayed
     def initialize_launcher(max_active_jobs=MAX_ACTIVE_JOBS)
       @max_active_jobs = max_active_jobs
       @jobs = {}
-      @sem = Mutex.new
+      @mutex = Mutex.new
     end
 
     # Launch the job in a thread and register it. Returns whether the job
     # has been launched or not.
     def launch(job)
       return false unless can_execute job
+      s = Semaphore.new
       t = Thread.new do
+        s.wait
         begin
           job.run_with_lock Job::MAX_RUN_TIME, name
         ensure
           unregister_job job
+          job.connection.release_connection rescue nil
         end
       end
       register_job job, t
+      s.signal
       return true
     end
 
@@ -126,13 +130,14 @@ module Delayed
     end
 
     def unregister_job(job)
-      @sem.synchronize do
+      @mutex.synchronize do
         @jobs.delete get_object(job)
+        log "No jobs right now!" if @jobs.size == 0
       end
     end
 
     def register_job(job, thread)
-      @sem.synchronize do
+      @mutex.synchronize do
         @jobs[get_object(job)] = {
           :thread     => thread,
           :job        => job,

data/lib/delayed_job.rb

@@ -1,5 +1,6 @@
 autoload :ActiveRecord, 'activerecord'
 
+require File.dirname(__FILE__) + '/semaphore'
 require File.dirname(__FILE__) + '/delayed/message_sending'
 require File.dirname(__FILE__) + '/delayed/performable_method'
 require File.dirname(__FILE__) + '/delayed/yaml_ext'

data/lib/semaphore.rb

@@ -0,0 +1,54 @@
+#
+# $Id: semaphore.rb,v 1.2 2003/03/15 20:10:10 fukumoto Exp $
+#
+
+class CountingSemaphore
+
+  def initialize(initvalue = 0)
+    @counter = initvalue
+    @waiting_list = []
+  end
+
+  def wait
+    Thread.critical = true
+    if (@counter -= 1) < 0
+      @waiting_list.push(Thread.current)
+      Thread.stop
+    end
+    self
+  ensure
+    Thread.critical = false
+  end
+
+  def signal
+    Thread.critical = true
+    begin
+      if (@counter += 1) <= 0
+	t = @waiting_list.shift
+	t.wakeup if t
+      end
+    rescue ThreadError
+      retry
+    end
+    self
+  ensure
+    Thread.critical = false
+  end
+
+  alias down wait
+  alias up signal
+  alias P wait
+  alias V signal
+
+  def exclusive
+    wait
+    yield
+  ensure
+    signal
+  end
+
+  alias synchronize exclusive
+
+end
+
+Semaphore = CountingSemaphore

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 2
   - 1
-  - 6
-  version: 2.1.6
+  - 8
+  version: 2.1.8
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +01:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/delayed/worker.rb
 - lib/delayed/yaml_ext.rb
 - lib/delayed_job.rb
+- lib/semaphore.rb
 - spec/database.rb
 - spec/delayed_method_spec.rb
 - spec/job_spec.rb
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify