coney_island 0.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6e16e85747e1d7eb7ca008b0b193d0b7bb5968
-  data.tar.gz: 26c71402914d4a3947270aed653da903955ce0b2
+  metadata.gz: 7d3235b3a4ba3ab30ab945fe646f984e590fadc3
+  data.tar.gz: 0c246415fb168c1bfa4f7164c9d351cd1fa71a75
 SHA512:
-  metadata.gz: 8798aa23ab52a69563f618cbe330279389635a6abe0432b95a599913610cf05a701387fa6142467bf4b5b9f6497f8c3e3bba40b7fbef08f5650a09f5b9cf8502
-  data.tar.gz: e76ed3ee358c56c542fc4ce909aed4e0fc0f849bdb6eaccd5044b11d987c619f01f35446014f0b1c02c10243191894c174985a35dc917ca860475f4bd85bb94f
+  metadata.gz: bdff43883e7dad6eed7488bef99997eecd2c4414518790bfe8c0db483ad4e5a489fada58167e07d7155a28501cf75e10ef8ae05dea5e013c698d3cb147281049
+  data.tar.gz: c3afba951a9fc3eeedf21a6239421db1c88847f934572720fef74391fe01b4dcc63a6e2249df9ea6fdbc92df8f76cc426d232eb19015eabd4905b4dc58c8c59e

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.7"
+  VERSION = "0.7.1"
 end

data/lib/coney_island/worker.rb

@@ -78,16 +78,16 @@ module ConeyIsland
       defined?(ActiveRecord::Base) and
         ActiveRecord::Base.establish_connection
 
-      EventMachine.run do
+      begin
+        EventMachine.run do
 
-        Signal.trap('INT') do
-          self.shutdown('INT')
-        end
-        Signal.trap('TERM') do
-          self.shutdown('TERM')
-        end
+          Signal.trap('INT') do
+            self.shutdown('INT')
+          end
+          Signal.trap('TERM') do
+            self.shutdown('TERM')
+          end
 
-        begin
           AMQP.connect(self.amqp_parameters) do |connection|
             self.log.info("Connected to AMQP broker. Running #{AMQP::VERSION}")
             @channel = AMQP::Channel.new(connection)
@@ -106,22 +106,22 @@ module ConeyIsland
               self.handle_incoming_message(metadata,payload)
             end
           end
-        rescue AMQP::TCPConnectionFailed => e
-          ConeyIsland.tcp_connection_retries ||= 0
-            ConeyIsland.tcp_connection_retries += 1
-          if ConeyIsland.tcp_connection_retries >= ConeyIsland.tcp_connection_retry_limit
-            message = "Failed to connect to RabbitMQ #{ConeyIsland.tcp_connection_retry_limit} times, bailing out"
-            self.log.error(message)
-            ConeyIsland.poke_the_badger(e, {
-              code_source: 'ConeyIsland::Worker.start',
-              reason: message}
-            )
-          else
-            message = "Failed to connecto to RabbitMQ Attempt ##{ConeyIsland.tcp_connection_retries} time(s), trying again in #{ConeyIsland.tcp_connection_retry_interval} seconds..."
-            self.log.error(message)
-            sleep(10)
-            retry
-          end
+        end
+      rescue AMQP::TCPConnectionFailed => e
+        ConeyIsland.tcp_connection_retries ||= 0
+          ConeyIsland.tcp_connection_retries += 1
+        if ConeyIsland.tcp_connection_retries >= ConeyIsland.tcp_connection_retry_limit
+          message = "Failed to connect to RabbitMQ #{ConeyIsland.tcp_connection_retry_limit} times, bailing out"
+          self.log.error(message)
+          ConeyIsland.poke_the_badger(e, {
+            code_source: 'ConeyIsland::Worker.start',
+            reason: message}
+          )
+        else
+          message = "Failed to connecto to RabbitMQ Attempt ##{ConeyIsland.tcp_connection_retries} time(s), trying again in #{ConeyIsland.tcp_connection_retry_interval} seconds..."
+          self.log.error(message)
+          sleep(10)
+          retry
         end
       end
     end

data/test/dummy/log/test.log

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

metadata

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