beanstalker 0.4.15 → 0.4.17

data/VERSION

@@ -1 +1 @@
-0.4.15
+0.4.17

data/beanstalker.gemspec

@@ -1,41 +1,39 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{beanstalker}
-  s.version = "0.4.15"
+  s.version = "0.4.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-12-27}
+  s.date = %q{2011-02-09}
   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 = [
     "README"
   ]
   s.files = [
-    ".gitignore",
-     "COPYING",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "beanstalker.gemspec",
-     "init.rb",
-     "lib/beanstalker/daemonizer_handler.rb",
-     "lib/beanstalker/extend.rb",
-     "lib/beanstalker/queue.rb",
-     "lib/beanstalker/worker.rb"
+    "COPYING",
+    "README",
+    "Rakefile",
+    "VERSION",
+    "beanstalker.gemspec",
+    "init.rb",
+    "lib/beanstalker/daemonizer_handler.rb",
+    "lib/beanstalker/extend.rb",
+    "lib/beanstalker/mapper.rb",
+    "lib/beanstalker/queue.rb",
+    "lib/beanstalker/worker.rb"
   ]
   s.homepage = %q{http://github.com/glebpom/beanstalker}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Beanstalker provides deep integration with Beanstalk. Fork from http://github.com/kristjan/async_observer}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/beanstalker/mapper.rb

@@ -0,0 +1,23 @@
+module Beanstalker
+  class Mapper
+    def initialize(*args)
+      @mapping = {}
+      args.each do |filename|
+        include_from_file(filename)
+      end
+    end
+
+    def include_from_file(filename)
+      puts "Loading #{filename}"
+      instance_eval(File.read(filename), filename)
+    end
+
+    def on(name, &block)
+      @mapping[name.to_sym] = block
+    end
+
+    def method_for(name)
+      @mapping[name.to_sym]
+    end
+  end
+end

data/lib/beanstalker/worker.rb

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'beanstalker/queue'
+require 'beanstalker/mapper'
 
 module Beanstalker; end
 
@@ -51,6 +52,8 @@ class Beanstalker::Worker
   end
 
   def initialize(top_binding, options = {})
+    mapper_file = "#{RAILS_ROOT}/config/beanstalker_mapper.rb"
+    @mapper = Beanstalker::Mapper.new(mapper_file) if File.exist?(mapper_file)
     @top_binding = top_binding
     @stop = false
     @options = options
@@ -144,7 +147,11 @@ class Beanstalker::Worker
 
   def dispatch(job)
     ActiveRecord::Base.verify_active_connections!
-    return run_ao_job(job) if beanstalker_job?(job)
+    if rails_job?(job)
+      run_ao_job(job)
+    elsif mapped_job?(job)
+      run_mapped_job(job)
+    end
   end
 
   def safe_dispatch(job)
@@ -231,8 +238,34 @@ class Beanstalker::Worker
     Daemonizer.logger.info "Unexpected Beanstalkd error: #{job.server}/#{job.id}. #{e.inspect}"
   end
 
+  def run_with_ruby_timeout_if_set(job_desc, job, &block)
+    if @options[:ruby_timeout]
+      timeout = (job.stats['ttr'].to_f * 0.8)
+      logger.info "TO=#{timeout} sec. Job id=#{job.stats['id']}. Running '#{job_desc}'. Age #{job.stats['age']}, Releases #{job.stats['releases']}, TTR #{job.stats['ttr']}"
+      Timeout.timeout(timeout) do
+        block.call
+      end
+    else
+      logger.info "Job id=#{job.stats['id']}. Running '#{job_desc}'. Age #{job.stats['age']}, Releases #{job.stats['releases']}, TTR #{job.stats['ttr']}"
+      block.call
+    end
+  end
+
+  def run_mapped_job(job)
+    run_with_ruby_timeout_if_set(job[:name], job) do
+      t1 = Time.now
+      if @map_job = map_job(job[:name])
+        @map_job.call(job[:params] || {})
+        logger.info "Finished. Job id=#{job.stats['id']}. Mapped from '#{job[:name]}'. Time taken: #{(Time.now - t1).to_f} sec"
+      else
+        logger.error "Job id=#{job.stats['id']}. Mapping not found: '#{job[:name]}'. Releases #{job.stats['releases']}. Deleting"
+      end
+      job.delete
+    end
+  end
+
   def run_ao_job(job)
-    runner = lambda {
+    run_with_ruby_timeout_if_set(job[:code], job) do
       t1 = Time.now
       f = self.class.before_filter
       statistics = job.stats.dup
@@ -245,16 +278,6 @@ class Beanstalker::Worker
       else
         logger.info "Not runnind due to :before_filter restriction. Job id=#{statistics['id']}. Code '#{code}'."
       end
-    }
-    if @options[:ruby_timeout]
-      timeout = (job.stats['ttr'].to_f * 0.8)
-      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
-      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
   end
 
@@ -262,10 +285,18 @@ class Beanstalker::Worker
     eval(job.ybody[:code], @top_binding, "(beanstalk job #{job.id})", 1)
   end
 
-  def beanstalker_job?(job)
+  def rails_job?(job)
     begin job.ybody[:type] == :rails rescue false end
   end
 
+  def mapped_job?(job)
+    begin job.ybody[:type] == :mapped rescue false end
+  end
+
+  def map_job(job)
+    @mapper && @mapper.method_for(job)
+  end
+
   def do_all_work
     logger.info 'finishing all running jobs'
     f = self.class.finish

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beanstalker
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 45
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 15
-  version: 0.4.15
+  - 17
+  version: 0.4.17
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +03:00
+date: 2011-02-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
 - COPYING
 - README
 - Rakefile
@@ -82,6 +81,7 @@ files:
 - init.rb
 - lib/beanstalker/daemonizer_handler.rb
 - lib/beanstalker/extend.rb
+- lib/beanstalker/mapper.rb
 - lib/beanstalker/queue.rb
 - lib/beanstalker/worker.rb
 has_rdoc: true
@@ -89,8 +89,8 @@ homepage: http://github.com/glebpom/beanstalker
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Beanstalker provides deep integration with Beanstalk. Fork from http://github.com/kristjan/async_observer

data/.gitignore

@@ -1 +0,0 @@
-*~