coney_island 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ace26e15f62cea555f90b2d01df1c171a663bdd
-  data.tar.gz: ac72a73cc54eef7b8ce0cf787bfd7cad67f7662c
+  metadata.gz: 22e0c2669707a9d1cc3ee045e95ca32039f5fcf6
+  data.tar.gz: 2ef3018f894f47115f0d0b2336e25156619765fc
 SHA512:
-  metadata.gz: d62459ea99bf7d992555add7bd1659aac5fd2422b94d8ad6c0e20b5802481857e5708445bdfe29e0beb41335225429bdbb9c88fe6952bf2530ecd5cdf15b8370
-  data.tar.gz: d7148fc33a739223600f3ba69e886c5054d011863b59304713d3933b7d2cd38a50e9943159ec8ca031fc6eb397f12af54eb6efa7be85d07d3bede9c8f4044f9f
+  metadata.gz: d8c14389f6cd4e1deffcb9c25474b1eb0833d4a79d61786276b2b0d37c1acf03fd21f73b012f2d321117f2664fb031a65a73d6fee0f55a7d57d938d56a88e48b
+  data.tar.gz: 52d86d4d9fed7ebcecc46f465f1dfb4c1563ae7b719bbbc7a2149404c71967f37e20f95e9bf1033b61ff7cf7a0b0a153ee524987f7823d8e634b3f07a1619a78

data/lib/coney_island/job.rb

@@ -81,12 +81,7 @@ module ConeyIsland
     end
 
     def next_attempt_delay
-      if self.delaying?
-        time_delayed = (Time.now - self.delay_start).round
-        new_delay = self.delay - time_delayed
-      else
-        ConeyIsland.delay_seed**(self.attempts - 1)
-      end
+      ConeyIsland.delay_seed**(self.attempts - 1)
     end
 
     def resubmit_args
@@ -95,36 +90,10 @@ module ConeyIsland
     end
 
     def finalize_job
-      metadata.ack if !self.acked? && !ConeyIsland.running_inline?
+      metadata.ack if !ConeyIsland.running_inline?
       log.info("finished job #{id}")
       ConeyIsland::Worker.running_jobs.delete self
     end
 
-    def delaying?
-      @delaying
-    end
-
-    def acked?
-      @acked
-    end
-
-    def activate_after_delay
-      @delaying = false
-      ConeyIsland::Worker.delayed_jobs.delete self
-    end
-
-    def delay_job
-      @delaying = true
-      ConeyIsland::Worker.delayed_jobs << self
-      unless ConeyIsland.running_inline?
-        @acked = true
-        metadata.ack
-      end
-      log.info("delaying job #{id} for #{self.delay} seconds")
-    end
-
-    def requeue_delay
-      ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
-    end
   end
 end

data/lib/coney_island/submitter.rb

@@ -51,10 +51,18 @@ module ConeyIsland
       end
     end
 
+    def self.channel
+      @channel
+    end
+
     def self.exchange
       @exchange
     end
 
+    def self.delay_exchange
+      @delay_exchange
+    end
+
     def self.amqp_parameters=(params)
       @amqp_parameters = params
     end
@@ -86,8 +94,10 @@ module ConeyIsland
         retry
       end
     else
-      @channel  ||= AMQP::Channel.new(@connection)
+      @channel ||= AMQP::Channel.new(@connection)
       @exchange = @channel.topic('coney_island')
+      @delay_exchange = @channel.topic('coney_island_delay')
+      @delay_queue = {}
     end
 
     def self.amqp_connection
@@ -104,18 +114,36 @@ module ConeyIsland
         job_args ||= {}
         job_args['klass'] = klass_name
         job_args['method_name'] = method_name
+        job_args.stringify_keys!
         if @run_inline
-          job_args.stringify_keys!
           job = ConeyIsland::Job.new(nil, job_args)
           job.handle_job
         else
-          work_queue = job_args.delete :work_queue
+          work_queue = job_args.delete 'work_queue'
           if klass.respond_to? :coney_island_settings
             work_queue ||= klass.coney_island_settings[:work_queue]
           end
           work_queue ||= 'default'
-          self.exchange.publish(job_args.to_json, {routing_key: "carousels.#{work_queue}"}) do
-            RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
+          delay = job_args['delay']
+          if klass.respond_to? :coney_island_settings
+            delay ||= klass.coney_island_settings[:delay]
+          end
+          if delay && delay.to_i > 0
+            puts 'delaying...'
+            @delay_queue[work_queue] ||= {}
+            unless @delay_queue[work_queue][delay].present?
+              @delay_queue[work_queue][delay] ||= self.channel.queue(
+                work_queue + '_delayed_' + delay.to_s, auto_delete: false, durable: true,
+                arguments: {'x-dead-letter-exchange' => 'coney_island', 'x-message-ttl' => delay * 1000})
+              @delay_queue[work_queue][delay].bind(self.delay_exchange, routing_key: 'carousels.' + work_queue + ".#{delay}")
+            end
+            self.delay_exchange.publish(job_args.to_json, {routing_key: "carousels.#{work_queue}.#{delay}"}) do
+              RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
+            end
+          else
+            self.exchange.publish(job_args.to_json, {routing_key: "carousels.#{work_queue}"}) do
+              RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
+            end
           end
         end
         true

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/lib/coney_island/worker.rb

@@ -135,7 +135,7 @@ module ConeyIsland
 
             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.bind(self.exchange, routing_key: 'carousels.' + @ticket + '.#')
             @queue.subscribe(:ack => true) do |metadata,payload|
               self.handle_incoming_message(metadata,payload)
             end
@@ -164,16 +164,7 @@ module ConeyIsland
       begin
         args = JSON.parse(payload)
         job = Job.new(metadata, args)
-        if job.delay.present?
-          self.delayed_jobs << job
-          job.delay_job
-          EventMachine.add_timer(job.delay) do
-            job.activate_after_delay
-            job.handle_job
-          end
-        else
-          job.handle_job
-        end
+        job.handle_job
       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

data/test/coney_island_test.rb

@@ -39,6 +39,7 @@ class ConeyIslandTest < MiniTest::Test
       ConeyIsland.tcp_connection_retry_interval = 0
       @fake_channel = MiniTest::Mock.new
       @fake_channel.expect :topic, nil, [String]
+      @fake_channel.expect :topic, nil, [String]
       AMQP::Channel.stub(:new,@fake_channel) do
         AMQP.stub(:connect, force_tcp_error) do
           ConeyIsland::Submitter.handle_connection

data/test/dummy/log/test.log

@@ -10,3 +10,15 @@ 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
+undefined method `[]' for nil:NilClass
+undefined method `[]' for nil:NilClass
+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...
+undefined method `[]' for nil:NilClass
+undefined method `[]' for nil:NilClass
+undefined method `[]' for nil:NilClass
+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
+undefined method `[]' for nil:NilClass
+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...

data/test/performer_test.rb

@@ -23,8 +23,6 @@ class PerformerTest < MiniTest::Test
       job.timeout.must_equal 10
     end
     it 'sets work queue for the class' do
-      capture_publish = proc do |payload,options|
-      end
       @exchange = Minitest::Mock.new
       def @exchange.publish(payload,options,&blk)
         ::PerformerTest.messages[:publish_hash] = options
@@ -32,15 +30,13 @@ class PerformerTest < MiniTest::Test
       ConeyIsland::Submitter.stub(:handle_connection, nil) do
         ConeyIsland::Submitter.stub(:exchange, @exchange) do
           ConeyIsland::Submitter.stop_running_inline
-          ConeyIsland::Submitter.submit(MyPerformer, :add_to_list, args: [[]])
+          ConeyIsland::Submitter.submit(MyPerformer, :perform, args: [], delay: 0)
         end
       end
       @exchange.verify
       ::PerformerTest.messages[:publish_hash][:routing_key].must_equal "carousels.cyclone"
     end
     it 'overrides the class work queue with the job-level work queue' do
-      capture_publish = proc do |payload,options|
-      end
       @exchange = Minitest::Mock.new
       def @exchange.publish(payload,options,&blk)
         ::PerformerTest.messages[:publish_hash] = options
@@ -48,7 +44,7 @@ class PerformerTest < MiniTest::Test
       ConeyIsland::Submitter.stub(:handle_connection, nil) do
         ConeyIsland::Submitter.stub(:exchange, @exchange) do
           ConeyIsland::Submitter.stop_running_inline
-          ConeyIsland::Submitter.submit(MyPerformer, :add_to_list, work_queue: 'boardwalk', args: [[]])
+          ConeyIsland::Submitter.submit(MyPerformer, :add_to_list, work_queue: 'boardwalk', args: [[]], delay: 0)
         end
       end
       @exchange.verify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Eric Draut