coney_island 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebf4aa13f64b3592f798c759e5a28a5e17c84ab
-  data.tar.gz: b22573d2f20af9c3e212351632615e38e2b39aae
+  metadata.gz: 050d03c1dc851560dddc25519b8617422ff2adb5
+  data.tar.gz: ab3a5e5547555b561cead2a49974d328515759bc
 SHA512:
-  metadata.gz: e31f447e805176a230c56540099b49dfc5f348287a9cfd957398cd8ebd7017debf9a5c605d650cbb6999d6acdd10d8b134642763d981f5febd30d9ef8da811ee
-  data.tar.gz: 767d5f3ef2575904e57cf6b53f2da1f48e6aba5e6e74efa5e476064ef4f601812ca017ac0dbbe533f4274306669699f67f3b28fde51abe98fcd66f09faf57e0f
+  metadata.gz: 5a5831c75657774b8ed15ba2f2433cb56f11f712e1c886afa4be2f50176f1e73f0c2cbf09cf6ee6e38278e5bed33e00f67dbc2c0e4be8433424ab16ea13e7594
+  data.tar.gz: b7eec6034c0934a255be9c66bbc885e5f8d38189543ab43a3db90714b4d258dc5f312593dbccaaa22927f99202e73c8be41a93feedba0e081853ec0228664f15

data/lib/coney_island/job.rb

@@ -65,18 +65,7 @@ module ConeyIsland
 
     def handle_job
       ConeyIsland::Worker.running_jobs << self
-      Timeout::timeout(timeout) do
-        execute_job_method
-      end
-    rescue Timeout::Error => e
-      if self.attempts >= self.retry_limit
-        log.error("Request #{self.id} timed out after #{self.timeout} seconds, bailing out after 3 attempts")
-        ConeyIsland.poke_the_badger(e, {work_queue: self.ticket, job_payload: self.args, reason: 'Bailed out after 3 attempts'})
-      else
-        log.error("Request #{self.id} timed out after #{self.timeout} seconds on attempt number #{self.attempts}, retrying...")
-        self.attempts += 1
-        ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
-      end
+      execute_job_method
     rescue StandardError => e
       log.error("Error executing #{self.class_name}##{self.method_name} #{self.id} for id #{self.instance_id} with args #{self.args}:")
       log.error(e.message)

data/lib/coney_island/submitter.rb

@@ -1,4 +1,6 @@
 module ConeyIsland
+  # TODO: Refactor this to instantiate and use instance methods for
+  # ease of testing and thread safety.
   class Submitter
 
     def self.run_inline
@@ -98,6 +100,10 @@ module ConeyIsland
       end
     end
 
+    def self.connected?
+      !!connection && connection.connected?
+    end
+
     def self.handle_connection
       Rails.logger.info("ConeyIsland::Submitter.handle_connection connecting...")
       self.connection = Bunny.new(self.amqp_parameters)
@@ -179,6 +185,9 @@ module ConeyIsland
       work_queue ||= ConeyIsland.default_settings[:work_queue]
       delay      ||= ConeyIsland.default_settings[:delay]
 
+      # Make sure we have a connection if we need one
+      handle_connection if !running_inline? && !connected?
+
       if self.running_inline?
         # Just run this inline if we're not threaded
         ConeyIsland::Job.new(nil, job_args).handle_job

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 end

data/test/dummy/log/test.log

@@ -168,3 +168,29 @@ ConeyIsland::Submitter.handle_connection connecting...
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.handle_connection connecting...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.handle_connection connecting...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.handle_connection connecting...

data/test/job_test.rb

@@ -8,42 +8,6 @@ class JobTest < MiniTest::Test
         @metadata.expect :ack, nil
       end
 
-      it "retries on timeout with correct initial attempt_count and delay" do
-        job = ConeyIsland::Job.new(@metadata,
-          { 'klass' => 'TestModel',
-            'method_name' => :take_too_long,
-            'timeout' => 0.0001 }
-        )
-        capture_submissions = lambda { |klass,method_name,options|
-          ::JobTest.messages[:job_options] ||= []
-          ::JobTest.messages[:job_options] << options
-        }
-        ConeyIsland.stub(:submit, capture_submissions) do
-          job.handle_job
-        end
-        ::JobTest.messages[:job_options].last['attempt_count'].must_equal 2
-        ::JobTest.messages[:job_options].last['delay'].must_equal 2
-      end
-
-      it "retries on timeout with correct subsequent attempt_count and delay" do
-        job = ConeyIsland::Job.new(@metadata,
-          { 'klass' => 'TestModel',
-            'method_name' => :take_too_long,
-            'timeout' => 0.0001,
-            'attempt_count' => 2,
-            'delay' => 2 }
-        )
-        capture_submissions = lambda { |klass,method_name,options|
-          ::JobTest.messages[:job_options] ||= []
-          ::JobTest.messages[:job_options] << options
-        }
-        ConeyIsland.stub(:submit, capture_submissions) do
-          job.handle_job
-        end
-        ::JobTest.messages[:job_options].last['attempt_count'].must_equal 3
-        ::JobTest.messages[:job_options].last['delay'].must_equal 4
-      end
-
       it "bails out on timeout if retry limit reached" do
         ConeyIsland.stop_running_inline
         job = ConeyIsland::Job.new(@metadata,
@@ -151,4 +115,4 @@ class JobTest < MiniTest::Test
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Eric Draut
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,16 +44,16 @@ dependencies:
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Want guaranteed delivery between your queue and your workers using ACKs?