coney_island 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6908c473508be8ab7f86e151c62bf2d0db07406
-  data.tar.gz: 7611e7c037d453f77d2c167f793b4a0eea8e1b8d
+  metadata.gz: 05c6e2876d543540b1ff828f5964a36f55bfc101
+  data.tar.gz: c8a6662f9299ac76103a6df543de875a9f9e4c9c
 SHA512:
-  metadata.gz: 112c89b1653b3945210a8b00d675735930a2330e21d45b9acd808c193a0ef986750472be8df10501c3fc31fa9f3d2ed5b670ded905e8c61ac25b02412954406d
-  data.tar.gz: aff0f62fe7948afe9028de91d7586a930ab78f231939182ea6258e04f0a479699c01d71766288658b963e82f60718d0590f3caabffbd5c6d56b24893b7228d98
+  metadata.gz: 8a6073e152f4403febe9c2fe4f13693c01c4cfe9fb5b8695a816c5f6636f1e142debc26254c8501ea833d09b913ca94815007c37f4ad848a15be7c6386da199e
+  data.tar.gz: 46e49ad4d43124b6c8ee27661a0fd696022d3c5b7536e3e2fd41d4ad9316ceb0cea9fb879ae130dd76cfbb7e325b3da74702b0901440d8fb78b5aeb54f012391

data/lib/coney_island.rb

@@ -45,11 +45,6 @@ module ConeyIsland
   end
 
   def self.handle_connection(log)
-    if self.config
-      log.info("ConeyIsland.handle_connection, notifier service is #{self.notifier}")
-    else
-      log.info("NO CONFIG FOUND!!!")
-    end
     @connection ||= AMQP.connect(self.amqp_parameters)
   rescue AMQP::TCPConnectionFailed => e
     self.tcp_connection_retries ||= 0
@@ -156,6 +151,7 @@ end
 require 'coney_island/notifiers/honeybadger_notifier'
 require 'coney_island/worker'
 require 'coney_island/submitter'
+require 'coney_island/job_argument_error'
 if defined? ActiveJob::QueueAdapters
   require 'coney_island/queue_adapters'
 end

data/lib/coney_island/job_argument_error.rb

@@ -0,0 +1,4 @@
+module ConeyIsland
+  class JobArgumentError < ArgumentError
+  end
+end

data/lib/coney_island/submitter.rb

@@ -11,7 +11,8 @@ module ConeyIsland
 
     def self.submit(*args)
       if RequestStore.store[:cache_jobs]
-        RequestStore.store[:jobs].push args
+        job_id = SecureRandom.uuid
+        RequestStore.store[:jobs][job_id] = args
       else
         self.submit!(args)
       end
@@ -19,12 +20,21 @@ module ConeyIsland
 
     def self.submit!(args)
       self.handle_connection unless @run_inline
-      if :all_cached_jobs == args
-        RequestStore.store[:jobs].delete_if do |job_args|
-          self.publish_job(job_args)
+      begin
+        if :all_cached_jobs == args
+          Rails.logger.info("ConeyIsland::Submitter.submit! about to iterate over this many jobs: #{RequestStore.store[:jobs].length}")
+          RequestStore.store[:jobs].each do |job_id,job_args|
+            self.publish_job(job_args,job_id)
+          end
+        else
+          self.publish_job(args)
         end
-      else
-        self.publish_job(args)
+      rescue Exception => e
+        ConeyIsland.poke_the_badger(e,{
+          code_source: "ConeyIsland::Submitter.submit!",
+          message: "Error submitting job",
+          job_args: args
+          })
       end
     end
 
@@ -46,6 +56,7 @@ module ConeyIsland
         ConeyIsland.handle_connection(Rails.logger)
         @exchange = ConeyIsland.exchange
       else
+        Rails.logger.info("using independent submitter connection to RabbitMQ")
         self.submitter_connection
       end
     end
@@ -76,7 +87,11 @@ module ConeyIsland
       @exchange = @channel.topic('coney_island')
     end
 
-    def self.publish_job(args)
+    def self.amqp_connection
+      @connection
+    end
+
+    def self.publish_job(args, job_id = nil)
       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
         klass = args.shift
         klass = klass.name
@@ -91,15 +106,19 @@ module ConeyIsland
         else
           work_queue = job_args.delete :work_queue
           work_queue ||= 'default'
-          self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
+          self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}") do
+            RequestStore.store[:jobs].delete job_id if job_id.present?
+          end
         end
+        true
+      else
+        raise ConeyIsland::JobArgumentError.new
       end
-      true
     end
 
     def self.cache_jobs
       RequestStore.store[:cache_jobs] = true
-      RequestStore.store[:jobs] = []
+      RequestStore.store[:jobs] = {}
     end
 
     def self.flush_jobs
@@ -121,7 +140,7 @@ module ConeyIsland
 
     def self.publisher_shutdown
       EventMachine.add_periodic_timer(1) do
-        if RequestStore.store[:jobs] && (RequestStore.store[:jobs].length > 0)
+        if RequestStore.store[:jobs] && RequestStore.store[:jobs].length > 0
           Rails.logger.info("Waiting for #{RequestStore.store[:jobs].length} publishes to finish")
         else
           Rails.logger.info("Shutting down coney island publisher")

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/dummy/log/test.log

@@ -0,0 +1 @@
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1

data/test/submitter_test.rb

@@ -26,5 +26,12 @@ class SubmitterTest < MiniTest::Test
         @exchange.verify
       end
     end
+    describe "error handling" do
+      it "handles argument errors for jobs" do
+        assert_raises(ConeyIsland::JobArgumentError) do
+          ConeyIsland::Submitter.publish_job([:not_a_class, :add_to_list, args: [[]]])
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - Rakefile
 - bin/coney_island
 - lib/coney_island.rb
+- lib/coney_island/job_argument_error.rb
 - lib/coney_island/notifiers/airbrake_notifier.rb
 - lib/coney_island/notifiers/honeybadger_notifier.rb
 - lib/coney_island/queue_adapter.rb