beanstalker 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/beanstalker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beanstalker}
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-08-04}
+  s.date = %q{2010-08-05}
   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

@@ -17,6 +17,9 @@ module Beanstalker
       if option(:timeout_handler)
         Worker.custom_timeout_handler = option(:timeout_handler)
       end
+      if option(:before_filter)                 
+        Worker.before_filter = option(:before_filter)
+      end
       @worker = Worker.new(binding, 
                 :tube => option(:tube), 
                 :servers => option(:servers),

data/lib/beanstalker/worker.rb

@@ -195,13 +195,18 @@ class Beanstalker::Worker
 
   def run_ao_job(job)
     runner = lambda {
-      time_taken = Benchmark.realtime do
-        f = self.class.before_filter
-        result = f.call(job) if f
+      t1 = Time.now
+      f = self.class.before_filter
+      statistics = job.stats.dup
+      code = job[:code]
+      can_run = f ? f.call(job) : true 
+      if can_run
         run_code(job)
+        job.delete
+        logger.info "Finished. Job id=#{statistics['id']}. Code '#{code}'. Time taken: #{(Time.now - t1).to_f} sec"      
+      else
+        logger.info "Not runnind due to :before_filter restriction. Job id=#{statistics['id']}. Code '#{code}'."
       end
-      logger.info "Finished. Job id=#{job.stats['id']}. Code '#{job[:code]}'. Time taken: #{time_taken} sec"
-      job.delete
     }
     if @options[:ruby_timeout]
       timeout = (job.stats['ttr'].to_f * 0.8)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beanstalker
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +04:00
+date: 2010-08-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency