coney_island 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b268c2c6635a2b24dca5298f43937dd2d9d410f
-  data.tar.gz: f1625c8b2a24268d9161c4a569c38c4f890dc264
+  metadata.gz: 7c6e16e85747e1d7eb7ca008b0b193d0b7bb5968
+  data.tar.gz: 26c71402914d4a3947270aed653da903955ce0b2
 SHA512:
-  metadata.gz: e8578848be730f24c738d135dea8215eee0405f203444c21321f2717f05076d9789ff19238b55b7e870e1fa71a6ae12fa8b232ff57a1b398ed644d2043781e9d
-  data.tar.gz: 4a018053eae956c62b0d6518594505ae04a01477521571f3f0542ef4d59422e9567ff666b16b92c1b5d0a34f91f5790f7bb8e3f4fdfe9b2382aef2db23ea2019
+  metadata.gz: 8798aa23ab52a69563f618cbe330279389635a6abe0432b95a599913610cf05a701387fa6142467bf4b5b9f6497f8c3e3bba40b7fbef08f5650a09f5b9cf8502
+  data.tar.gz: e76ed3ee358c56c542fc4ce909aed4e0fc0f849bdb6eaccd5044b11d987c619f01f35446014f0b1c02c10243191894c174985a35dc917ca860475f4bd85bb94f

data/lib/coney_island/railtie.rb

@@ -2,7 +2,9 @@ require 'coney_island/coney_island_adapter'
 module ConeyIsland
   class Railtie < Rails::Railtie
     initializer "coney_island.coney_island_adapter" do
-      ActiveJob::QueueAdapters.send :autoload, :ConeyIslandAdapter
+      if defined? ActiveJob
+        ActiveJob::QueueAdapters.send :autoload, :ConeyIslandAdapter
+      end
     end
   end
 end

data/lib/coney_island/version.rb

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

data/lib/coney_island/worker.rb

@@ -78,19 +78,19 @@ module ConeyIsland
       defined?(ActiveRecord::Base) and
         ActiveRecord::Base.establish_connection
 
-      begin
-        EventMachine.run do
+      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)
+            @channel = AMQP::Channel.new(connection)
             @exchange = @channel.topic('coney_island')
 
             #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
@@ -106,22 +106,22 @@ module ConeyIsland
               self.handle_incoming_message(metadata,payload)
             end
           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
+        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
     end
@@ -141,7 +141,7 @@ module ConeyIsland
         end
       rescue Timeout::Error => e
         ConeyIsland.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args, reason: 'timeout in subscribe code before calling job method'})
-      rescue Exception => e
+      rescue StandardError => e
         ConeyIsland.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args})
         self.log.error("ConeyIsland code error, not application code:\n#{e.inspect}\nARGS: #{args}")
       end
@@ -166,7 +166,7 @@ module ConeyIsland
             self.handle_job(metadata,args,job_id)
           end
         end
-      rescue Exception => e
+      rescue StandardError => e
         ConeyIsland.poke_the_badger(e, {work_queue: @ticket, job_payload: args})
         self.log.error("Error executing #{args['klass']}##{args['method_name']} #{job_id} for id #{args['instance_id']} with args #{args}:")
         self.log.error(e.message)

data/test/dummy/log/test.log

@@ -1,2 +1,4 @@
 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.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails