coney_island 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f3c4d7395e6deffa7e2b8bcf76fe5ecfee1f3a3
-  data.tar.gz: acb76aa99f6b6258b8e97954d799ca532cd12bb9
+  metadata.gz: 35249aa1fc86cd520eb3128ebc8b4f5b581536bc
+  data.tar.gz: fb1f5b1f66a2628d7138bf0961f938de78b7c4cc
 SHA512:
-  metadata.gz: f04d66a0281c35b45b06cc1e7af45ad2aa679f1d6476c4d3b727cd0e7b6b78bc6fda60658f8f5dace3bd237fbca7cb6502f0b9b724fbb2845f2d7864e43b86f6
-  data.tar.gz: cb6268ab85acbf1a2a40edae1988bd19e8e2e77c14e0092af15f1be2806fcc8993184dc0fddca66df7c8e8a7002c6c1c7d6d946790913545078bed36bfd74ae8
+  metadata.gz: e3604103b90ab2b082539deb8103c48f58bd8be236ee7fce57670ad438f6bc0fab158dde85eff0f103e3537b759027dd2d999924b8b426b7ea0569c46a90d9c4
+  data.tar.gz: c3df98682ca6a4109043c2e915437728a747d2ef9b4b94adc94c4a9117695bdded489bda9c9d00d3e62fd4351daaf1b7998aab90de89a2b2ac1d2c54f71628fb

data/lib/coney_island/version.rb

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

data/lib/coney_island/worker.rb

@@ -101,6 +101,12 @@ module ConeyIsland
             self.log.info("Connected to AMQP broker. Running #{AMQP::VERSION}")
             @channel = AMQP::Channel.new(connection)
             @exchange = @channel.topic('coney_island')
+            #Handle a lost connection to rabbitMQ
+            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
+            end
 
             #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
             heartbeat_exchange = self.channel.fanout('coney_island_heartbeat')
@@ -228,11 +234,10 @@ module ConeyIsland
     end
 
     def self.shutdown(signal)
-      shutdown_time = Time.now
       @child_pids.each do |child_pid|
         Process.kill(signal, child_pid)
       end
-      @queue.unsubscribe
+      @queue.unsubscribe rescue nil
       EventMachine.add_periodic_timer(1) do
         if self.job_attempts.any?
           self.log.info("Waiting for #{self.job_attempts.length} requests to finish")

data/test/dummy/log/test.log

@@ -12,3 +12,7 @@ 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...
+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

metadata

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