ayl-beanstalk 0.1.8 → 0.2.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'ayl', ">= 0.1.0"
+gem 'ayl', ">= 0.2.1"
 gem 'beanstalk-client', ">= 1.1.0"
 gem 'daemons', ">= 1.1.0"
 

data/Gemfile.lock

@@ -30,7 +30,7 @@ GEM
     activesupport (3.1.2)
       multi_json (~> 1.0)
     arel (2.2.1)
-    ayl (0.1.0)
+    ayl (0.2.1)
     beanstalk-client (1.1.1)
     builder (3.0.0)
     coderay (0.9.8)
@@ -114,7 +114,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ayl (>= 0.1.0)
+  ayl (>= 0.2.1)
   beanstalk-client (>= 1.1.0)
   bundler (>= 1.0.0)
   daemons (>= 1.1.0)

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.2.0

data/ayl-beanstalk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ayl-beanstalk"
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["j0hnds@gmail.com"]
-  s.date = "2013-02-25"
+  s.date = "2013-07-22"
   s.description = "Ayl extension to provide beanstalk support."
   s.email = "j0hnds@gmail.com"
   s.executables = ["ayl_beanstalk", "ayl_worker", "ayl_worker_control"]
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ayl>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<ayl>, [">= 0.2.1"])
       s.add_runtime_dependency(%q<beanstalk-client>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<daemons>, [">= 1.1.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
     else
-      s.add_dependency(%q<ayl>, [">= 0.1.0"])
+      s.add_dependency(%q<ayl>, [">= 0.2.1"])
       s.add_dependency(%q<beanstalk-client>, [">= 1.1.0"])
       s.add_dependency(%q<daemons>, [">= 1.1.0"])
       s.add_dependency(%q<rspec>, [">= 2.3.0"])
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ayl>, [">= 0.1.0"])
+    s.add_dependency(%q<ayl>, [">= 0.2.1"])
     s.add_dependency(%q<beanstalk-client>, [">= 1.1.0"])
     s.add_dependency(%q<daemons>, [">= 1.1.0"])
     s.add_dependency(%q<rspec>, [">= 2.3.0"])

data/lib/ayl-beanstalk/engine.rb

@@ -36,6 +36,7 @@ module Ayl
             pool.yput(message.to_hash, message.options.priority, message.options.delay, message.options.time_to_run)
           rescue Exception => ex
             logger.error "Error submitting message to beanstalk: #{ex}"
+            Ayl::Mailer.instance.deliver_message("Error submitting message to beanstalk", ex)
           end
         end
       end

data/lib/ayl-beanstalk/worker.rb

@@ -14,40 +14,73 @@ module Ayl
 
       def process_messages
         logger.debug "#{self.class.name} entering process_messages loop watching: #{Ayl::MessageOptions.default_queue_name}"
-        # trap('TERM') { puts "## Got the term signal"; @stop = true }
-        # trap('INT') { puts "## Got the int signal"; @stop = true }
         # Set the queue that we will be watching
         pool.watch(Ayl::MessageOptions.default_queue_name)
         while true
           break if @stop
-          job = pool.reserve
+          job = nil
+          begin
+            job = pool.reserve
+          rescue Exception => ex
+            logger.error "#{self.class.name} Exception in process_messages: #{ex}\n#{ex.backtrace.join("\n")}"
+            Ayl::Mailer.instance.deliver_message("#{self.class.name} Exception in process_messages.", ex)
+            delete_job(job) unless job.nil?
+            next
+          end
           break if job.nil?
+          msg = nil
           begin
-            process_message(Ayl::Message.from_hash(job.ybody))
-            job.delete
+            msg = Ayl::Message.from_hash(job.ybody)
+            process_message(msg)
+            delete_job(job)
           rescue Ayl::UnrecoverableMessageException => ex
             logger.error "#{self.class.name} Unrecoverable exception in process_messages: #{ex}"
-            job.delete
+            Ayl::Mailer.instance.deliver_message("#{self.class.name} Unrecoverable exception in process_messages", ex)
+            delete_job(job)
           rescue SystemExit
             # This exception is raised when 'Kernel.exit' is called. In this case
             # we want to make sure the job is deleted, then we simply re-raise
             # the exception and we go bye-bye.
-            job.delete
+            delete_job(job)
             raise
           rescue Exception => ex
             logger.error "#{self.class.name} Exception in process_messages: #{ex}\n#{ex.backtrace.join("\n")}"
-            logger.debug "Age of job: #{job.age}"
-            if job.age > 60
-              logger.debug "Deleting job"
-              job.delete
+            if msg.options.decay_failed_job
+              handle_job_decay(job, ex)
             else
-              logger.debug "Decaying job"
-              job.decay
+              delete_job(job)
+              Ayl::Mailer.instance.deliver_message("#{self.class.name} Exception in process_messages.", ex)
             end
           end
         end
       end
 
+      def handle_job_decay(job, ex)
+        logger.debug "Age of job: #{job.age}"
+        if job.age > 60
+          Ayl::Mailer.instance.deliver_message("#{self.class.name} Deleting decayed job; it just took too long.", ex)
+          logger.debug "Deleting job"
+          delete_job(job)
+        else
+          logger.debug "Decaying job"
+          decay_job(job)
+        end
+      end
+
+      def delete_job(job)
+        job.delete
+      rescue RuntimeError => ex
+        logger.error "#{self.class.name} Error deleting job: #{ex}\n#{ex.backtrace.join("\n")}"
+        Ayl::Mailer.instance.deliver_message("#{self.class.name} Error deleting job", ex)
+      end
+
+      def decay_job(job)
+        job.decay
+      rescue RuntimeError => ex
+        logger.error "#{self.class.name} Error decaying job: #{ex}\n#{ex.backtrace.join("\n")}"
+        Ayl::Mailer.instance.deliver_message("#{self.class.name} Error decaying job", ex)
+      end
+
     end
 
   end

data/spec/ayl_worker_control_spec.rb

@@ -13,14 +13,14 @@ describe 'ayl_worker_control script' do
 
     it "should honor the use of the -a option to name the daemon" do
       ARGV.concat [ '--', '--pid-path', '/tmp', '--name', 'the_name' ]
-      Daemons.should_receive(:run).with(anything, { :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => '/tmp', :app_name => 'the_name' })
+      Daemons.should_receive(:run).with(anything, { :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => '/tmp', :multiple => true, :app_name => 'the_name' })
 
       load(@ayl_control_script, true)
     end
 
     it "should assume the use of the script for the daemon name if no name argument is specified" do
       ARGV.concat [ '--', '--pid-path', '/tmp' ]
-      Daemons.should_receive(:run).with(anything, { :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => '/tmp' })
+      Daemons.should_receive(:run).with(anything, { :log_dir => '/tmp', :log_output => true, :dir_mode => :normal, :dir => '/tmp', :multiple => true })
 
       load(@ayl_control_script, true)
     end

data/spec/engine_spec.rb

@@ -11,6 +11,7 @@ describe Ayl::Beanstalk::Engine do
       Kernel.stub(:puts)
       @engine = Ayl::Beanstalk::Engine.new
       @engine.stub_chain(:logger, :info)
+      @engine.stub_chain(:logger, :debug)
       @engine.stub_chain(:logger, :error)
     end
 
@@ -46,7 +47,7 @@ describe Ayl::Beanstalk::Engine do
       it "should submit the specified message to beanstalk" do
         mock_pool = mock("Beanstalk::Pool")
         mock_pool.should_receive(:use).with("default")
-        mock_pool.should_receive(:yput).with( { :type => :ayl, :code => "23.to_s(2)" }, 512, 0, 120)
+        mock_pool.should_receive(:yput).with( { :type => :ayl, :decay_failed_job => false, :code => "23.to_s(2)" }, 512, 0, 120)
 
         ::Beanstalk::Pool.should_receive(:new).with([ "localhost:11300" ]).and_return(mock_pool)
 

data/spec/worker_spec.rb

@@ -12,6 +12,7 @@ describe Ayl::Beanstalk::Worker do
       @worker = Ayl::Beanstalk::Worker.new
       @worker.stub_chain(:logger, :info)
       @worker.stub_chain(:logger, :error)
+      @worker.stub_chain(:logger, :debug)
       Ayl::MessageOptions.default_queue_name = 'default'
     end
     
@@ -90,6 +91,32 @@ describe Ayl::Beanstalk::Worker do
       @worker.process_messages
     end
 
+    it "should not decay a job that receives an active-record exception when the default message options are used" do
+      mock_job = mock("Beanstalk::Job")
+      mock_job.should_not_receive(:decay)
+      mock_job.should_receive(:ybody).and_return({ :type => :ayl, :code => "Dog" })
+      mock_job.should_not_receive(:age)
+      mock_job.should_receive(:delete)
+
+      mock_pool = mock("Beanstalk::Pool")
+      mock_pool.should_receive(:watch).with("default")
+      mock_pool.should_receive(:reserve).and_return(mock_job, nil)
+
+      mock_message = mock("Ayl::Message")
+      mock_message.should_receive(:evaluate).and_raise(ActiveRecord::RecordNotFound)
+      mock_message.should_receive(:options).and_return do 
+        mock("Options").tap do | mock_opts |
+          mock_opts.should_receive(:decay_failed_job).and_return(false)
+        end
+      end
+      Ayl::Message.stub(:from_hash).with({ :type => :ayl, :code => "Dog" }).and_return(mock_message)
+
+      ::Beanstalk::Pool.should_receive(:new).with([ "localhost:11300" ]).and_return(mock_pool)
+
+      @worker.process_messages
+      
+    end
+
     it "should decay a job that receives an active-record exception on receipt of message that is less than 60 seconds old" do
       mock_job = mock("Beanstalk::Job")
       mock_job.should_receive(:decay)
@@ -102,6 +129,11 @@ describe Ayl::Beanstalk::Worker do
 
       mock_message = mock("Ayl::Message")
       mock_message.should_receive(:evaluate).and_raise(ActiveRecord::RecordNotFound)
+      mock_message.should_receive(:options).and_return do 
+        mock("Options").tap do | mock_opts |
+          mock_opts.should_receive(:decay_failed_job).and_return(true)
+        end
+      end
       Ayl::Message.stub(:from_hash).with({ :type => :ayl, :code => "Dog" }).and_return(mock_message)
 
       ::Beanstalk::Pool.should_receive(:new).with([ "localhost:11300" ]).and_return(mock_pool)
@@ -121,12 +153,77 @@ describe Ayl::Beanstalk::Worker do
 
       mock_message = mock("Ayl::Message")
       mock_message.should_receive(:evaluate).and_raise(ActiveRecord::RecordNotFound)
+      mock_message.should_receive(:options).and_return do 
+        mock("Options").tap do | mock_opts |
+          mock_opts.should_receive(:decay_failed_job).and_return(true)
+        end
+      end
       Ayl::Message.stub(:from_hash).with({ :type => :ayl, :code => "Dog" }).and_return(mock_message)
 
       ::Beanstalk::Pool.should_receive(:new).with([ "localhost:11300" ]).and_return(mock_pool)
 
       @worker.process_messages
     end
+
+    it "should not attempt to decay the job if there is a problem deleting a job after the message is successfully processed" do
+
+      mock_job = mock("Beanstalk::Job")
+      mock_job.should_receive(:delete).and_raise("Delete failed for some reason")
+      mock_job.should_receive(:ybody).and_return({ :type => :ayl, :code => "23.to_s(2)" })
+      mock_job.should_not_receive(:age)
+
+      mock_pool = mock("Beanstalk::Pool")
+      mock_pool.should_receive(:watch).with("default")
+      mock_pool.should_receive(:reserve).and_return(mock_job, nil)
+
+      mock_message = mock("Ayl::Message")
+      mock_message.should_receive(:evaluate)
+      Ayl::Message.stub(:from_hash).with({ :type => :ayl, :code => "23.to_s(2)" }).and_return(mock_message)
+
+      ::Beanstalk::Pool.should_receive(:new).with([ "localhost:11300" ]).and_return(mock_pool)
+
+      expect { @worker.process_messages }.not_to raise_error
+    end
+  end
+
+  context '#delete_job' do
+
+    before(:each) do
+      Kernel.stub(:puts)
+      @worker = Ayl::Beanstalk::Worker.new
+      @worker.stub_chain(:logger, :info)
+      @worker.stub_chain(:logger, :error)
+      @worker.stub_chain(:logger, :debug)
+      Ayl::MessageOptions.default_queue_name = 'default'
+    end
+
+    it "should not raise an exception if the job.delete fail" do
+      mock_job = mock("Job")
+      mock_job.should_receive(:delete).and_raise("Delete failed for some reason")
+
+      expect { @worker.delete_job(mock_job) }.not_to raise_error
+    end
+
+  end
+
+  context '#decay_job' do
+
+    before(:each) do
+      Kernel.stub(:puts)
+      @worker = Ayl::Beanstalk::Worker.new
+      @worker.stub_chain(:logger, :info)
+      @worker.stub_chain(:logger, :error)
+      @worker.stub_chain(:logger, :debug)
+      Ayl::MessageOptions.default_queue_name = 'default'
+    end
+
+    it "should not raise an exception if the job.delete fail" do
+      mock_job = mock("Job")
+      mock_job.should_receive(:decay).and_raise("Decay failed for some reason")
+
+      expect { @worker.decay_job(mock_job) }.not_to raise_error
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ayl-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ayl
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -880016066289096428
+      hash: 2726199589731342968
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: