coney_island 0.7.12 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35249aa1fc86cd520eb3128ebc8b4f5b581536bc
-  data.tar.gz: fb1f5b1f66a2628d7138bf0961f938de78b7c4cc
+  metadata.gz: c35298c5543296c4c41a42bd756f6ef193a29186
+  data.tar.gz: ef14d5797940fd78f324126b7d86e42c7130ef04
 SHA512:
-  metadata.gz: e3604103b90ab2b082539deb8103c48f58bd8be236ee7fce57670ad438f6bc0fab158dde85eff0f103e3537b759027dd2d999924b8b426b7ea0569c46a90d9c4
-  data.tar.gz: c3df98682ca6a4109043c2e915437728a747d2ef9b4b94adc94c4a9117695bdded489bda9c9d00d3e62fd4351daaf1b7998aab90de89a2b2ac1d2c54f71628fb
+  metadata.gz: 790d75b9af3c13a51f0493350956c8026d87976efb5f45b2cee87c7c06891a19ac574264ab9aa8e638b162c56f93e693fbd5141e70bb01f7d69b9a5bacd9c3a7
+  data.tar.gz: 7b45b0327ea9fe7f01bf76a509921f80dc3e8b355ad35a49206d8d0df68c08fc8289b7581cefbc766b42e7be364d82654288e5ef6eb551802deaf17a0bcb2fbd

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.7.12"
+  VERSION = "0.8"
 end

data/lib/coney_island/worker.rb

@@ -105,7 +105,9 @@ module ConeyIsland
             connection.on_tcp_connection_loss do |connection, settings|
               # since we lost the connection, rabbitMQ will resend all jobs we didn't finish
               # so drop them and restart
-              self.abandon_and_shutdown
+              unless @shutting_down
+                self.abandon_and_shutdown
+              end
             end
 
             #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
@@ -228,12 +230,13 @@ module ConeyIsland
     end
 
     def self.abandon_and_shutdown
-      self.log.info("Lost RabbitMQ connection, abandoning current jobs and restarting")
+      self.log.info("Lost RabbitMQ connection, abandoning current jobs and shutting down")
       self.clear_job_attempts
       self.shutdown('TERM')
     end
 
     def self.shutdown(signal)
+      @shutting_down = true
       @child_pids.each do |child_pid|
         Process.kill(signal, child_pid)
       end

data/test/dummy/log/test.log

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: '0.8'
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails