blaxter-delayed_job 2.1.3 → 2.1.4

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/lib/delayed/{job_handler.rb → job_launcher.rb}

@@ -1,3 +1,5 @@
+require 'thread'
+
 # Handle asynchronously launch of jobs, one per grouped value
 #
 # It needs the following method to be defined:
@@ -32,6 +34,7 @@ module Delayed
     def initialize_launcher(max_active_jobs=MAX_ACTIVE_JOBS)
       @max_active_jobs = max_active_jobs
       @jobs = {}
+      @sem = Mutex.new
     end
 
     # Launch the job in a thread and register it. Returns whether the job
@@ -84,6 +87,12 @@ module Delayed
       @jobs.size
     end
 
+    def kill_threads!
+      each_job_in_execution do |job, started_at, thread|
+        puts "Killing #{job.name}"
+        thread.terminate
+      end
+    end
     # ^ public methods -------------------------------------------------------
     private
     # v private methods ------------------------------------------------------
@@ -111,15 +120,19 @@ module Delayed
     end
 
     def unregister_job(job)
-      @jobs.delete get_object(job)
+      @sem.synchronize do
+        @jobs.delete get_object(job)
+      end
     end
 
     def register_job(job, thread)
-      @jobs[get_object(job)] = {
-        :thread     => thread,
-        :job        => job,
-        :started_at => Time.now
-      }
+      @sem.synchronize do
+        @jobs[get_object(job)] = {
+          :thread     => thread,
+          :job        => job,
+         :started_at => Time.now
+        }
+      end
     end
 
     def get_object(job)

data/lib/delayed/worker.rb

@@ -72,6 +72,7 @@ module Delayed
         end
         break if self.exit
       end
+      kill_threads!
     ensure
       Job.clear_locks! name
       say "<=== Finishing job worker #{name}"

data/lib/delayed_job.rb

@@ -3,11 +3,11 @@ autoload :ActiveRecord, 'activerecord'
 require File.dirname(__FILE__) + '/delayed/message_sending'
 require File.dirname(__FILE__) + '/delayed/performable_method'
 require File.dirname(__FILE__) + '/delayed/yaml_ext'
-require File.dirname(__FILE__) + '/delayed/job_handler'
+require File.dirname(__FILE__) + '/delayed/job_launcher'
 require File.dirname(__FILE__) + '/delayed/job'
 require File.dirname(__FILE__) + '/delayed/worker'
 
-Object.send(:include, Delayed::MessageSending)   
+Object.send(:include, Delayed::MessageSending)
 Module.send(:include, Delayed::MessageSending::ClassMethods)
 
 if defined?(Merb::Plugins)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,7 @@ files:
 - generators/delayed_job/templates/migration.rb
 - init.rb
 - lib/delayed/job.rb
-- lib/delayed/job_handler.rb
+- lib/delayed/job_launcher.rb
 - lib/delayed/message_sending.rb
 - lib/delayed/performable_method.rb
 - lib/delayed/worker.rb