blaxter-delayed_job 2.1.8 → 2.1.9

data/VERSION

@@ -1 +1 @@
-2.1.8
+2.1.9

data/lib/delayed/job.rb

@@ -228,7 +228,11 @@ module Delayed
 
       begin
         runtime =  Benchmark.realtime do
-          Timeout.timeout(max_run_time.to_i) { invoke_job }
+          Timeout.timeout(max_run_time.to_i) {
+            Delayed::Worker.logger.debug "-> #{Thread.current.object_id} invoke_job"
+            invoke_job
+            Delayed::Worker.logger.debug "<- #{Thread.current.object_id} invoke_job"
+          }
         end
         destroy_successful_jobs ? destroy :
           update_attribute(:finished_at, Time.now)

data/lib/delayed/job_launcher.rb

@@ -43,16 +43,20 @@ module Delayed
       return false unless can_execute job
       s = Semaphore.new
       t = Thread.new do
+        log "##{Thread.current.object_id} before wait"
         s.wait
+        log "###{Thread.current.object_id} after wait"
         begin
           job.run_with_lock Job::MAX_RUN_TIME, name
+        rescue Exception => e
+          log "ERROR: #{e}"
         ensure
           unregister_job job
-          job.connection.release_connection rescue nil
         end
       end
       register_job job, t
       s.signal
+      log "Launched job #{job.name}, there are #{jobs_in_execution} jobs in execution"
       return true
     end
 
@@ -61,24 +65,23 @@ module Delayed
       if jobs_in_execution > 0
         margin = 20
         title = "Jobs In Execution"
-        puts "\n #{'='*margin} #{title} #{'='*margin} "
-        puts " There are #{jobs_in_execution} jobs running."
+        log "#{'='*margin} #{title} #{'='*margin} "
+        log " There are #{jobs_in_execution} jobs running."
         each_job_in_execution do |job, started_at, thread|
           duration = Duration.new(Time.now - started_at)
-          puts "\tJob #{job.id}: #{job.name}"
-          puts "\t   Running on #{thread} (#{thread.status}) for #{duration}"
+          log "\tJob #{job.id}: #{job.name}"
+          log "\t   Running on #{thread} (#{thread.status}) for #{duration}"
         end
-        puts " #{'=' * (margin * 2 + title.size + 2)} "
+        log "#{'=' * (margin * 2 + title.size + 2)} "
       else
-        puts "\n\tThere is no jobs in execution right now!"
+        log "\n\tThere is no jobs in execution right now!"
       end
     end
 
     # Sanity check of dead threads for precaution, but probably won't be
     # necessary
     def check_thread_sanity
-      @jobs.values.each do |v|
-        thread = v[:thread]
+      each_job_in_execution do |job, started_at, thread|
         unless thread.alive?
           log "Dead thread? Terminate it!, This should not be happening"
           thread.terminate
@@ -93,13 +96,13 @@ module Delayed
 
     def jobs_ids_in_execution
       ret = []
-      each_job_in_execution {|job| ret << job.id }
+      each_job_in_execution {|job, x, xx| ret << job.id }
       ret
     end
 
     def kill_threads!
       each_job_in_execution do |job, started_at, thread|
-        puts "Killing #{job.name}"
+        log "Killing #{job.name}"
         thread.terminate
       end
     end
@@ -109,10 +112,22 @@ module Delayed
 
     # Whether we can or not execute this job
     def can_execute(job)
-      return false if is_already_in_execution(job)
+      if is_already_in_execution(job)
+        log "#{job.name}: already in execution"
+        return false
+      end
       object = get_object(job)
-      object && ! is_there_job_in_execution_for(object) &&
-        jobs_in_execution < @max_active_jobs
+      if ! object
+        log "No object #{job.inspect}"
+        return false
+      elsif is_there_job_in_execution_for(object)
+        log "#{job.name}: already a job in execution for #{object}"
+        return false
+      elsif jobs_in_execution >= @max_active_jobs
+        log "#{job.name}: there are already many jobs in execution"
+        return false
+      end
+      true
     end
 
     def is_already_in_execution(job)
@@ -130,20 +145,24 @@ module Delayed
     end
 
     def unregister_job(job)
+      log "<-- Let's unregister #{job.name} (#{job.id}) (#{get_object(job)})"
       @mutex.synchronize do
         @jobs.delete get_object(job)
         log "No jobs right now!" if @jobs.size == 0
       end
+      log "<== Unregistered #{job.name} (#{job.id}) (#{get_object(job)})"
     end
 
     def register_job(job, thread)
+      log "--> Let's register #{job.name} (#{job.id}) (#{get_object(job)})"
       @mutex.synchronize do
         @jobs[get_object(job)] = {
           :thread     => thread,
           :job        => job,
-         :started_at => Time.now
+          :started_at => Time.now
         }
       end
+      log "==> Registered #{job.name} (#{job.id}) (#{get_object(job)})"
     end
 
     def get_object(job)
@@ -155,4 +174,4 @@ module Delayed
       end
     end
   end # module JobLauncher
-end # module Delayed
+end # module Delayed

data/lib/delayed/worker.rb

@@ -2,7 +2,7 @@ module Delayed
   HIDE_BACKTRACE = true
 
   class Worker
-    SLEEP = 5
+    SLEEP = 60
     DEFAULT_WORKER_NAME = "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
     # Indicates that we have catched a signal and we have to exit asap
     cattr_accessor :exit
@@ -70,9 +70,14 @@ module Delayed
         else
           normal_loop
         end
-        break if self.exit
+        if self.exit
+          log "Exit loop"
+          break
+        end
       end
       kill_threads!
+    rescue Exception => e
+      log "ERROR on worker loop: #{e}"
     ensure
       Job.clear_locks! name
       say "<=== Finishing job worker #{name}"
@@ -106,16 +111,18 @@ module Delayed
     end
 
     def sleep_for_a_little_while
+      log "Sleep #{sleep_time.to_i}"
       sleep(sleep_time.to_i) unless self.exit
+      log "Sleep done"
     end
 
     def group_by_loop
+      clean_pool_connections
       check_thread_sanity
-      jobs_to_execute.each do |job|
-        if launch job
-          log "Launched job #{job.name}, there are #{jobs_in_execution} jobs in execution"
-        end
-      end
+      jobs = jobs_to_execute
+      log "There are #{jobs.size} jobs to be executed (#{jobs_in_execution})"
+      report_jobs_state
+      jobs.each{|j| launch j }
       sleep_for_a_little_while
     end
 
@@ -135,6 +142,13 @@ module Delayed
       end
     end
 
+    def clean_pool_connections
+      # Workaround for windows (at least xp and 2003 server)
+      # With mysql we have overflow of connections
+      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.verify_active_connections!
+    end
+
     def constraints
       {:max_run_time => Job::MAX_RUN_TIME,
        :worker_name  => name,

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 8
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +02:00
+date: 2011-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -42,10 +36,6 @@ files:
 - lib/delayed/yaml_ext.rb
 - lib/delayed_job.rb
 - lib/semaphore.rb
-- spec/database.rb
-- spec/delayed_method_spec.rb
-- spec/job_spec.rb
-- spec/story_spec.rb
 has_rdoc: true
 homepage: http://github.com/blaxter/delayed_job
 licenses: []
@@ -59,32 +49,26 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
 test_files: 
 - spec/database.rb
+- spec/story_spec.rb
 - spec/delayed_method_spec.rb
 - spec/job_spec.rb
-- spec/story_spec.rb