coney_island 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac3cad0c5d177268909fc720873ca8e1685c3ee
-  data.tar.gz: 61aaa5581003bde4d71cef07f0b693b7c9de8a8b
+  metadata.gz: be119aa818eeea8fb8b2cdf52d09f6dfa4aa7808
+  data.tar.gz: dfb08b7173494802f841249600e8e36290b7d69a
 SHA512:
-  metadata.gz: 7481c573ad7cb7e7233b6228a892da32628283d1b61630acb4bd23f25bed56002bc4843df36a5b5fd65e33593c7fb6701f4042cf06fb12790b33c2e8f724be20
-  data.tar.gz: ae1d41fd141a21d44264ad7abaa8e860295baf43f2782232d82ae966d6ed8b73f6ad8669874514d0b0822bc4ade19c52f8145ae5f29df57c37fe7d4176b9307c
+  metadata.gz: 899e4d474e01fda4e638d17bc850232fe47fc3ffadd96d8fbc28d14867bc47c847970efa45a386e16cc2efbd6d7b140bec6af1946bffe1ca9025b2a17e9b30c9
+  data.tar.gz: f22f782ce6460b553f2460b754e22525344befd733f6ee9bfb8442782957baf1d699203a5687c5e117e660c23769ebc988cb77baad934618632d10c1e5b519a3

data/lib/coney_island.rb

@@ -44,44 +44,6 @@ module ConeyIsland
     @notifier ||= "ConeyIsland::Notifiers::#{self.config[:notifier_service]}Notifier".constantize
   end
 
-  def self.handle_connection(log)
-    @connection ||= AMQP.connect(self.amqp_parameters)
-  rescue AMQP::TCPConnectionFailed => e
-    self.tcp_connection_retries ||= 0
-      self.tcp_connection_retries += 1
-    if self.tcp_connection_retries >= self.tcp_connection_retry_limit
-      message = "Failed to connect to RabbitMQ #{self.tcp_connection_retry_limit} times, bailing out"
-      log.error(message)
-      self.poke_the_badger(e, {
-        code_source: 'ConeyIsland.handle_connection',
-        reason: message}
-      )
-    else
-      message = "Failed to connecto to RabbitMQ Attempt ##{self.tcp_connection_retries} time(s), trying again in #{self.tcp_connection_retry_interval} seconds..."
-      log.error(message)
-      self.poke_the_badger(e, {
-        code_source: 'ConeyIsland.handle_connection',
-        reason: message})
-      sleep(self.tcp_connection_retry_interval)
-      retry
-    end
-  else
-    @channel  ||= AMQP::Channel.new(@connection)
-    self.exchange = @channel.topic('coney_island')
-  end
-
-  def self.exchange=(amqp_exchange)
-    @exchange ||= amqp_exchange
-  end
-
-  def self.exchange
-    @exchange
-  end
-
-  def self.channel
-    @channel
-  end
-
   def self.config=(config_hash)
     self.amqp_parameters = config_hash.delete :amqp_connection
     if !self.single_amqp_connection?

data/lib/coney_island/submitter.rb

@@ -47,37 +47,30 @@ module ConeyIsland
     end
 
     def self.amqp_parameters
-      @amqp_parameters
-    end
-
-    def self.handle_connection
       if ConeyIsland.single_amqp_connection?
-        Rails.logger.info("using single connection to RabbitMQ")
-        ConeyIsland.handle_connection(Rails.logger)
-        @exchange = ConeyIsland.exchange
+        ConeyIsland.amqp_parameters
       else
-        Rails.logger.info("using independent submitter connection to RabbitMQ")
-        self.submitter_connection
+        @amqp_parameters
       end
     end
 
-    def self.submitter_connection
+    def self.handle_connection
       @connection ||= AMQP.connect(self.amqp_parameters)
     rescue AMQP::TCPConnectionFailed => e
-      @tcp_connection_retries ||= 0
-        @tcp_connection_retries += 1
-      if @tcp_connection_retries >= 6
-        message = "Failed to connect to RabbitMQ 6 times, bailing out"
+      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"
         Rails.logger.error(message)
         ConeyIsland.poke_the_badger(e, {
-          code_source: 'ConeyIsland::Submitter.submitter_connection',
+          code_source: 'ConeyIsland::Submitter.handle_connection',
           reason: message}
         )
       else
-        message = "Failed to connecto to RabbitMQ Attempt ##{@tcp_connection_retries} time(s), trying again in 10 seconds..."
+        message = "Failed to connecto to RabbitMQ Attempt ##{ConeyIsland.tcp_connection_retries} time(s), trying again in #{ConeyIsland.tcp_connection_retry_interval} seconds..."
         Rails.logger.error(message)
         ConeyIsland.poke_the_badger(e, {
-          code_source: 'ConeyIsland::Submitter.submitter_connection',
+          code_source: 'ConeyIsland::Submitter.handle_connection',
           reason: message})
         sleep(10)
         retry

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/coney_island/worker.rb

@@ -59,46 +59,13 @@ module ConeyIsland
     end
 
     def self.amqp_parameters
-      @amqp_parameters
-    end
-
-    def self.handle_connection
       if ConeyIsland.single_amqp_connection?
-        ConeyIsland.handle_connection(self.log)
-        @exchange = ConeyIsland.exchange
-        @channel = ConeyIsland.channel
-      else
-        self.worker_connection
-      end
-    end
-
-    def self.worker_connection
-      @connection ||= AMQP.connect(self.amqp_parameters)
-    rescue AMQP::TCPConnectionFailed => e
-      @tcp_connection_retries ||= 0
-        @tcp_connection_retries += 1
-      if @tcp_connection_retries >= 6
-        message = "Failed to connect to RabbitMQ 6 times, bailing out"
-        self.log.error(message)
-        ConeyIsland.poke_the_badger(e, {
-          code_source: 'ConeyIsland::Worker.worker_connection',
-          reason: message}
-        )
+        ConeyIsland.amqp_parameters
       else
-        message = "Failed to connecto to RabbitMQ Attempt ##{@tcp_connection_retries} time(s), trying again in 10 seconds..."
-        self.log.error(message)
-        ConeyIsland.poke_the_badger(e, {
-          code_source: 'ConeyIsland::Worker.worker_connection',
-          reason: message})
-        sleep(10)
-        retry
+        @amqp_parameters
       end
-    else
-      @channel  ||= AMQP::Channel.new(@connection)
-      @exchange = @channel.topic('coney_island')
     end
 
-
     def self.start
       @child_count.times do
         child_pid = Process.fork
@@ -110,30 +77,54 @@ module ConeyIsland
       end
       defined?(ActiveRecord::Base) and
         ActiveRecord::Base.establish_connection
-      EventMachine.run do
 
-        Signal.trap('INT') do
-          self.shutdown('INT')
-        end
-        Signal.trap('TERM') do
-          self.shutdown('TERM')
-        end
+      begin
+        EventMachine.run do
 
-        self.handle_connection
-        
-        self.log.info("Connecting to AMQP broker. Running #{AMQP::VERSION}")
+          Signal.trap('INT') do
+            self.shutdown('INT')
+          end
+          Signal.trap('TERM') do
+            self.shutdown('TERM')
+          end
 
-        #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
-        heartbeat_exchange = self.channel.fanout('coney_island_heartbeat')
-        EventMachine.add_periodic_timer(15) do
-          heartbeat_exchange.publish({:instance_name => @ticket})
+          AMQP.connect(self.amqp_parameters) do |connection|
+            self.log.info("Connected to AMQP broker. Running #{AMQP::VERSION}")
+            @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
+            heartbeat_exchange = self.channel.fanout('coney_island_heartbeat')
+            EventMachine.add_periodic_timer(15) do
+              heartbeat_exchange.publish({:instance_name => @ticket})
+            end
+
+            self.channel.prefetch @prefetch_count
+            @queue = self.channel.queue(@full_instance_name, auto_delete: false, durable: true)
+            @queue.bind(self.exchange, routing_key: 'carousels.' + @ticket)
+            @queue.subscribe(:ack => true) do |metadata,payload|
+              self.handle_incoming_message(metadata,payload)
+            end
+          end
         end
-
-        self.channel.prefetch @prefetch_count
-        @queue = self.channel.queue(@full_instance_name, auto_delete: false, durable: true)
-        @queue.bind(self.exchange, routing_key: 'carousels.' + @ticket)
-        @queue.subscribe(:ack => true) do |metadata,payload|
-          self.handle_incoming_message(metadata,payload)
+      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)
+          ConeyIsland.poke_the_badger(e, {
+            code_source: 'ConeyIsland::Worker.start',
+            reason: message})
+          sleep(10)
+          retry
         end
       end
     end

data/test/coney_island_test.rb

@@ -41,7 +41,7 @@ class ConeyIslandTest < MiniTest::Test
       @fake_channel.expect :topic, nil, [String]
       AMQP::Channel.stub(:new,@fake_channel) do
         AMQP.stub(:connect, force_tcp_error) do
-          ConeyIsland.handle_connection(Logger.new(File.open(File::NULL, "w")))
+          ConeyIsland::Submitter.handle_connection
         end
       end
       @fake_channel.verify

data/test/dummy/log/test.log

@@ -1,2 +1,10 @@
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+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...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails