beanstalker 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/beanstalker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beanstalker}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]

data/lib/beanstalker/daemonizer_handler.rb

@@ -11,11 +11,15 @@ module Beanstalker
     def start
       $logger = logger
       $logger.info "Starting cycle"
-      Worker.new(binding, 
+      if option(:error_handler)
+        Worker.custom_error_handler = option(:error_handler)
+      end
+      @worker = Worker.new(binding, 
                 :tube => option(:tube), 
                 :servers => option(:servers),
                 :worker_id => worker_id, 
-                :workers_count => workers_count).run
+                :workers_count => workers_count)
+      @worker.run
       $logger.info "Ending cycle"
     end
   end

data/lib/beanstalker/worker.rb

@@ -27,11 +27,6 @@ class Beanstalker::Worker
     attr_accessor :finish
     attr_accessor :custom_error_handler
     attr_accessor :before_filter
-    attr_writer :handle
-
-    def handle
-      @handle or raise 'no custom handler is defined'
-    end
 
     def error_handler(&block)
       self.custom_error_handler = block
@@ -76,8 +71,6 @@ class Beanstalker::Worker
     watched_tubes = Beanstalker::Queue.queue.list_tubes_watched.values.flatten #["default"]
     to_watch = tubes - watched_tubes
     to_ignore = watched_tubes - tubes
-    logger.debug "to_watch = #{to_watch.join(',')}"
-    logger.debug "to_ignore = #{to_ignore.join(',')}"
     to_watch.each do |t|
       Beanstalker::Queue.queue.watch(t)
     end
@@ -147,7 +140,6 @@ class Beanstalker::Worker
   def dispatch(job)
     ActiveRecord::Base.verify_active_connections!
     return run_ao_job(job) if beanstalker_job?(job)
-    return run_other(job)
   end
 
   def safe_dispatch(job)
@@ -174,32 +166,17 @@ class Beanstalker::Worker
   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"))
-    if job.stats['releases'] > 10
-      job.bury
-      logger.info "BURY job due to many releases"
-    else
-      job.decay
-    end
+    job.decay
   rescue Beanstalk::UnexpectedResponse
   end
 
   def run_ao_job(job)
-    logger.info "Running '#{job[:code]}'. Age #{job.stats['age']}, Release #{job.stats['releases']}"
+    logger.info "Running '#{job[:code]}'. Age #{job.stats['age']}, Releases #{job.stats['releases']}"
     f = self.class.before_filter
     result = f.call(job) if f
-    job.delete if job.ybody[:delete_first]
     run_code(job)
-    job.delete unless job.ybody[:delete_first]
+    job.delete
     logger.info "Finished"
-  rescue ActiveRecord::RecordNotFound => ex
-    logger.warn "Record not found. Doing decay"
-    unless job.ybody[:delete_first]
-      if job.age > 60
-        job.delete # it's old; this error is most likely permanent
-      else
-        job.decay # it could be replication delay so retry quietly
-      end
-    end
   end
 
   def run_code(job)
@@ -210,13 +187,8 @@ class Beanstalker::Worker
     begin job.ybody[:type] == :rails rescue false end
   end
 
-  def run_other(job)
-    logger.info 'trying custom handler'
-    self.class.handle.call(job)
-  end
-
   def do_all_work
-    logger.info 'finishing all running jobs. interrupt again to kill them.'
+    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: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Gleb Pomykalov