coney_island 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf7b8e2dfbaa750deb86831a4c1a98b42e620b0
-  data.tar.gz: 05701ccb0b9c4c3cdf4f1d293270bc55062c8c26
+  metadata.gz: c02ec5e2739e99b82cac31f7b393b6bde299f7f4
+  data.tar.gz: 2587ce1a6f993c4b273a341a7c0f3d216dd82cd4
 SHA512:
-  metadata.gz: be8931b31581fa30a558947a0625b672733b3b8dba793ef7887fed06ae659aa9f538452d30ae20d2f8bc36b97330b1844851258ee8992a31a45f051adc350001
-  data.tar.gz: 367b56c8b52f12e96f2451d80860e256767f013c3d3c19430822695da2923a08ef64d283771d150605be8ee3bdfd100b9b9baff8853b33c75f937373abb85b51
+  metadata.gz: 5cf7270c89c814973c28decd113525ac793d03293217ab470d8d953c4da3768bba5bf01dc10257fc678fee402d19d0f10b64d7c2f915300cae5761f0047d540a
+  data.tar.gz: 73595b08270efb41d1101ba4bd2895faac1436e012ba4ad140ef4b5514a387d4ab23f6cf8703e5c09526c443b27d0f0c1c7ba8c1709cb5c0991984c3c389c6cd

data/lib/coney_island.rb

@@ -13,7 +13,7 @@ module ConeyIsland
   end
 
   def self.amqp_parameters
-    @amqp_parameters ||= (self.config.present? ? self.config[:amqp_connection] : nil)
+    @amqp_parameters
   end
 
   def self.handle_connection
@@ -35,6 +35,11 @@ module ConeyIsland
   end
 
   def self.config=(config_hash)
+    self.amqp_parameters = config_hash.delete :amqp_connection
+    if !self.single_amqp_connection?
+      ConeyIsland::Submitter.amqp_parameters = config_hash.delete :amqp_connection_submitter
+      ConeyIsland::Worker.amqp_parameters = config_hash.delete :amqp_connection_worker
+    end
     ConeyIsland::Worker.config=(config_hash)
   end
 
@@ -42,6 +47,10 @@ module ConeyIsland
     ConeyIsland::Worker.config
   end
 
+  def self.single_amqp_connection?
+    !!self.amqp_parameters
+  end
+
   def self.initialize_background
     ConeyIsland::Worker.initialize_background
   end

data/lib/coney_island/submitter.rb

@@ -27,8 +27,31 @@ module ConeyIsland
       end
     end
 
+    def self.exchange
+      @exchange
+    end
+
+    def self.amqp_parameters=(params)
+      @amqp_parameters = params
+    end
+
+    def self.amqp_parameters
+      @amqp_parameters
+    end
+
+    def self.handle_connection
+      if ConeyIsland.single_amqp_connection?
+        ConeyIsland.handle_connection
+        @exchange = ConeyIsland.exchange
+      else
+        @connection ||= AMQP.connect(self.amqp_parameters)
+        @channel  ||= AMQP::Channel.new(@connection)
+        @exchange = @channel.topic('coney_island')
+      end
+    end
+
     def self.handle_publish(args)
-      ConeyIsland.handle_connection unless @run_inline
+      self.handle_connection unless @run_inline
       jobs = (args.first.is_a? Array) ? args : [args]
       jobs.each do |args|
         if (args.first.is_a? Class or args.first.is_a? Module) and (args[1].is_a? String or args[1].is_a? Symbol) and args.last.is_a? Hash and 3 == args.length
@@ -45,7 +68,7 @@ module ConeyIsland
           else
             work_queue = job_args.delete :work_queue
             work_queue ||= 'default'
-            ConeyIsland.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
+            self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
           end
         end
         RequestStore.store[:completed_jobs] ||= 0

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/coney_island/worker.rb

@@ -48,6 +48,35 @@ module ConeyIsland
       @notifier = "ConeyIsland::Notifiers::#{self.config[:notifier_service]}Notifier".constantize
     end
 
+    def self.exchange
+      @exchange
+    end
+
+    def self.channel
+      @channel
+    end
+
+    def self.amqp_parameters=(params)
+      @amqp_parameters = params
+    end
+
+    def self.amqp_parameters
+      @amqp_parameters
+    end
+
+    def self.handle_connection
+      if ConeyIsland.single_amqp_connection?
+        ConeyIsland.handle_connection
+        @exchange = ConeyIsland.exchange
+        @channel = ConeyIsland.channel
+      else
+        puts self.amqp_parameters
+        @connection ||= AMQP.connect(self.amqp_parameters)
+        @channel  ||= AMQP::Channel.new(@connection)
+        @exchange = @channel.topic('coney_island')
+      end
+    end
+
     def self.start
       @child_count.times do
         child_pid = Process.fork
@@ -68,19 +97,19 @@ module ConeyIsland
           self.shutdown('TERM')
         end
 
-        ConeyIsland.handle_connection
+        self.handle_connection
         
         self.log.info("Connecting to AMQP broker. Running #{AMQP::VERSION}")
 
         #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
-        heartbeat_exchange = ConeyIsland.channel.fanout('coney_island_heartbeat')
+        heartbeat_exchange = self.channel.fanout('coney_island_heartbeat')
         EventMachine.add_periodic_timer(15) do
           heartbeat_exchange.publish({:instance_name => @ticket})
         end
 
-        ConeyIsland.channel.prefetch @prefetch_count
-        @queue = ConeyIsland.channel.queue(@full_instance_name, auto_delete: false, durable: true)
-        @queue.bind(ConeyIsland.exchange, routing_key: 'carousels.' + @ticket)
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails