ayl-beanstalk 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/ayl-beanstalk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ayl-beanstalk"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["j0hnds@gmail.com"]
-  s.date = "2011-11-26"
+  s.date = "2012-03-06"
   s.description = "Ayl extension to provide beanstalk support."
   s.email = "j0hnds@gmail.com"
   s.executables = ["ayl_beanstalk", "ayl_worker", "ayl_worker_control"]

data/bin/ayl_worker

@@ -19,7 +19,8 @@ end
 
 require File.join(options[:app_path], options[:app_require])
 
-Ayl::MessageOptions.default_queue_name = options[:tube]
+# Don't set the default queue name if it has already been set else where
+Ayl::MessageOptions.default_queue_name = options[:tube] if Ayl::MessageOptions.default_queue_name == 'default'
 
 worker = Ayl::Engine.get_active_engine.worker
 worker.eval_binding = binding

data/lib/ayl-beanstalk/worker.rb

@@ -13,7 +13,7 @@ module Ayl
       end
 
       def process_messages
-        logger.info "#{self.class.name} entering process_messages loop"
+        logger.info "#{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
@@ -30,9 +30,12 @@ module Ayl
             job.delete
           rescue Exception => ex
             logger.error "#{self.class.name} Exception in process_messages: #{ex}\n#{ex.backtrace.join("\n")}"
+            logger.info "Age of job: #{job.age}"
             if job.age > 60
+              logger.info "Deleting job"
               job.delete
             else
+              logger.info "Decaying job"
               job.decay
             end
           end

data/spec/worker_spec.rb

@@ -12,15 +12,17 @@ describe Ayl::Beanstalk::Worker do
       @worker = Ayl::Beanstalk::Worker.new
       @worker.stub_chain(:logger, :info)
       @worker.stub_chain(:logger, :error)
+      Ayl::MessageOptions.default_queue_name = 'default'
     end
     
     it "should wait for a message to be received from beanstalk and process it" do
+      Ayl::MessageOptions.default_queue_name = 'the_queue_name'
       mock_job = mock("Beanstalk::Job")
       mock_job.should_receive(:delete)
       mock_job.should_receive(:ybody).and_return({ :type => :ayl, :code => "23.to_s(2)" })
 
       mock_pool = mock("Beanstalk::Pool")
-      mock_pool.should_receive(:watch).with("default")
+      mock_pool.should_receive(:watch).with("the_queue_name")
       # Returns nil on the second call.
       mock_pool.should_receive(:reserve).and_return(mock_job, nil)
       
@@ -92,7 +94,7 @@ describe Ayl::Beanstalk::Worker do
       mock_job = mock("Beanstalk::Job")
       mock_job.should_receive(:decay)
       mock_job.should_receive(:ybody).and_return({ :type => :ayl, :code => "Dog" })
-      mock_job.should_receive(:age).and_return(10)
+      mock_job.should_receive(:age).exactly(2).times.and_return(10)
 
       mock_pool = mock("Beanstalk::Pool")
       mock_pool.should_receive(:watch).with("default")
@@ -111,7 +113,7 @@ describe Ayl::Beanstalk::Worker do
       mock_job = mock("Beanstalk::Job")
       mock_job.should_receive(:delete)
       mock_job.should_receive(:ybody).and_return({ :type => :ayl, :code => "Dog" })
-      mock_job.should_receive(:age).and_return(65)
+      mock_job.should_receive(:age).exactly(2).times.and_return(65)
 
       mock_pool = mock("Beanstalk::Pool")
       mock_pool.should_receive(:watch).with("default")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ayl-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ayl
-  requirement: &76745740 !ruby/object:Gem::Requirement
+  requirement: &75023090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76745740
+  version_requirements: *75023090
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &76745460 !ruby/object:Gem::Requirement
+  requirement: &75022810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76745460
+  version_requirements: *75022810
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &76745190 !ruby/object:Gem::Requirement
+  requirement: &75022550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76745190
+  version_requirements: *75022550
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76744930 !ruby/object:Gem::Requirement
+  requirement: &75022280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *76744930
+  version_requirements: *75022280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76744580 !ruby/object:Gem::Requirement
+  requirement: &75021930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *76744580
+  version_requirements: *75021930
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76744270 !ruby/object:Gem::Requirement
+  requirement: &75021620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *76744270
+  version_requirements: *75021620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &76743930 !ruby/object:Gem::Requirement
+  requirement: &75021290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76743930
+  version_requirements: *75021290
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &76743560 !ruby/object:Gem::Requirement
+  requirement: &75020960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76743560
+  version_requirements: *75020960
 description: Ayl extension to provide beanstalk support.
 email: j0hnds@gmail.com
 executables:
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 36129679
+      hash: 1045641297
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: