beanstalker 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/beanstalker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beanstalker}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-07-29}
   s.description = %q{Beanstalker is a tool for executing long tasks in background in our rails application.}
   s.email = %q{glebpom@gmail.com}
   s.extra_rdoc_files = [

data/lib/beanstalker/daemonizer_handler.rb

@@ -14,11 +14,15 @@ module Beanstalker
       if option(:error_handler)
         Worker.custom_error_handler = option(:error_handler)
       end
+      if option(:timeout_handler)
+        Worker.custom_timeout_handler = option(:timeout_handler)
+      end
       @worker = Worker.new(binding, 
                 :tube => option(:tube), 
                 :servers => option(:servers),
                 :worker_id => worker_id, 
-                :workers_count => workers_count)
+                :workers_count => workers_count,
+                :ruby_timeout => option(:ruby_timeout).nil? ? true : option(:ruby_timeout))
       @worker.run
       $logger.info "Ending cycle"
     end

data/lib/beanstalker/queue.rb

@@ -77,7 +77,7 @@ class << Beanstalker::Queue
       packed = pkg(code, worker_opts, obj, sel)
     end
     
-    RAILS_DEFAULT_LOGGER.info("put #{pri} #{code} to #{tube}")
+    RAILS_DEFAULT_LOGGER.info("put #{pri} #{code} to #{tube} with ttr #{ttr}")
     put!(packed, pri, delay, ttr, tube)
   end
 

data/lib/beanstalker/worker.rb

@@ -26,12 +26,17 @@ class Beanstalker::Worker
   class << self
     attr_accessor :finish
     attr_accessor :custom_error_handler
+    attr_accessor :custom_timeout_handler
     attr_accessor :before_filter
 
     def error_handler(&block)
       self.custom_error_handler = block
     end
 
+    def timeout_handler(&block)
+      self.custom_timeout_handler = block
+    end
+
     def before_reserves
       @before_reserves ||= []
     end
@@ -45,10 +50,6 @@ class Beanstalker::Worker
     end
   end
   
-  def logger
-    $logger or RAILS_DEFAULT_LOGGER
-  end
-
   def initialize(top_binding, options = {})
     @top_binding = top_binding
     @stop = false
@@ -77,7 +78,7 @@ class Beanstalker::Worker
     to_ignore.each do |t|
       Beanstalker::Queue.queue.ignore(t)
     end
-    logger.info "Using tubes: #{Beanstalker::Queue.queue.list_tubes_watched.values.flatten.join(',')}"
+    Daemonizer.logger.info "Using tubes: #{Beanstalker::Queue.queue.list_tubes_watched.values.flatten.join(',')}"
     Daemonizer.flush_logger
   end
 
@@ -125,13 +126,13 @@ class Beanstalker::Worker
       rescue Beanstalk::DeadlineSoonError
         # Do nothing; immediately try again, giving the user a chance to
         # clean up in the before_reserve hook.
-        logger.info 'Job deadline soon; you should clean up.'
+        Daemonizer.logger.info 'Job deadline soon; you should clean up.'
       rescue Exception => ex
         @q_hint = nil # in case there's something wrong with this conn
-        logger.info(
+        Daemonizer.logger.info(
           "#{ex.class}: #{ex}\n" + ex.backtrace.join("\n"))
-        logger.info 'something is wrong. We failed to get a job.'
-        logger.info "sleeping for #{SLEEP_TIME}s..."
+        Daemonizer.logger.info 'something is wrong. We failed to get a job.'
+        Daemonizer.logger.info "sleeping for #{SLEEP_TIME}s..."
         sleep(SLEEP_TIME)
       end
     end
@@ -145,6 +146,8 @@ class Beanstalker::Worker
   def safe_dispatch(job)
     begin
       return dispatch(job)
+    rescue Timeout::Error
+      handle_timeout(job)
     rescue Interrupt => ex
       begin job.release rescue :ok end
       raise ex
@@ -163,20 +166,47 @@ class Beanstalker::Worker
     end
   end
 
+  def handle_timeout(job)
+    if self.class.custom_timeout_handler
+      self.class.custom_timeout_handler.call(job)
+    else
+      self.class.default_handle_timeout(job)
+    end
+  end
+
   def self.default_handle_error(job, ex)
-    logger.info "Job failed: #{job.server}/#{job.id}"
-    logger.info("#{ex.class}: #{ex}\n" + ex.backtrace.join("\n"))
+    Daemonizer.logger.info "Job failed: #{job.server}/#{job.id}"
+    Daemonizer.logger.info("#{ex.class}: #{ex}\n" + ex.backtrace.join("\n"))
+    job.decay
+  rescue Beanstalk::UnexpectedResponse => e
+    Daemonizer.logger.info "Unexpected Beanstalkd error: #{job.server}/#{job.id}. #{e.inspect}"
+  end
+
+  def self.default_handle_timeout(job)
+    Daemonizer.logger.info "Job timeout: #{job.server}/#{job.id}"
     job.decay
-  rescue Beanstalk::UnexpectedResponse
+  rescue Beanstalk::UnexpectedResponse => e
+    Daemonizer.logger.info "Unexpected Beanstalkd error: #{job.server}/#{job.id}. #{e.inspect}"
   end
 
   def run_ao_job(job)
-    logger.info "Running '#{job[:code]}'. Age #{job.stats['age']}, Releases #{job.stats['releases']}"
-    f = self.class.before_filter
-    result = f.call(job) if f
-    run_code(job)
-    job.delete
-    logger.info "Finished"
+    runner = lambda {
+      f = self.class.before_filter
+      result = f.call(job) if f
+      run_code(job)
+      job.delete
+    }
+    if @options[:ruby_timeout]
+      timeout = (job.stats['ttr'].to_f * 0.8)
+      Daemonizer.logger.info "TO=#{timeout} sec. Job id=#{job.stats['id']}. Running '#{job[:code]}'. Age #{job.stats['age']}, Releases #{job.stats['releases']}, TTR #{job.stats['ttr']}"
+      Timeout.timeout(timeout) do
+        runner.call
+      end
+    else
+      Daemonizer.logger.info "Job id=#{job.stats['id']}. Running '#{job[:code]}'. Age #{job.stats['age']}, Releases #{job.stats['releases']}, TTR #{job.stats['ttr']}"
+      runner.call
+    end
+    Daemonizer.logger.info "Finished"
   end
 
   def run_code(job)
@@ -188,7 +218,7 @@ class Beanstalker::Worker
   end
 
   def do_all_work
-    logger.info 'finishing all running jobs'
+    Daemonizer.logger.info 'finishing all running jobs'
     f = self.class.finish
     f.call if f
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beanstalker
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +04:00
+date: 2010-07-29 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency