pika_que 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ecc988c45a92ccc93c7bd93f07f1718b22706a
-  data.tar.gz: 572d69067683be65725366f62bd1e2d778bee080
+  metadata.gz: faba17eaee828074e195258b47a178d6e90e8674
+  data.tar.gz: '04959436f6a2e742b7cea6ba805d4b10f0b187ca'
 SHA512:
-  metadata.gz: 60a0900cc9d1cc73054d3fe88664850af3c092760972f99fc5da7f2b02805f458240cb7d257d4ccd0825a407aabbfca3df3c5ae2efedc8d70e4badadf79ac79f
-  data.tar.gz: 937f46dd60a3abc2a094d2d6165871d06cc5ce38e23580a4290aff9363cca7825615883019042cf6b19768fc1c82c91ac6593f11b5e88ac80b95e83a790d7dfa
+  metadata.gz: e5dc91623fa960d2eb130798ee6a1f89ae7fe2a5fe2199201b1c92bea7e55d6b53512a3a14b373d2bb8b7361a14777f57073aa73cfd33dea678fe0d8d2de6690
+  data.tar.gz: 9c70e4d7229bcb37409144d4905e9a94e9d6690e9a9babb17a2f397d3e384f4d5d48557702edc885c11c5ff09ea8636bf180a0e9f1bc9df73caa57fbff161975

data/examples/pika_que.yml

@@ -1,4 +1,11 @@
 processors:
   - workers:
-    - queue: default
     - queue: mailers
+    handler_class: PikaQue::Handlers::RetryHandler
+    handler_options:
+      retry_mode: :const
+  - workers:
+    - queue: default
+    handler_class: PikaQue::Handlers::RetryHandler
+    handler_options:
+      retry_mode: :exp

data/lib/pika_que.rb

@@ -10,6 +10,7 @@ require 'pika_que/connection'
 require 'pika_que/publisher'
 require 'pika_que/reporters/log_reporter'
 require 'pika_que/middleware/chain'
+require 'pika_que/handlers'
 require 'pika_que/worker'
 
 module PikaQue

data/lib/pika_que/codecs.rb

@@ -0,0 +1,9 @@
+module PikaQue
+  module Codecs
+
+    autoload :JSON, 'pika_que/codecs/json'
+    autoload :NOOP, 'pika_que/codecs/noop'
+    autoload :RAILS, 'pika_que/codecs/rails'
+
+  end
+end

data/lib/pika_que/configuration.rb

@@ -71,7 +71,7 @@ module PikaQue
     #   :concurrency        => 1,
     #   :ack                => true,
     #   :handler_class      => nil,
-    #   :handler_options    => nil,
+    #   :handler_options    => {},
     #   :codec              => PikaQue::Codecs::JSON
     # }
 

data/lib/pika_que/handlers.rb

@@ -0,0 +1,9 @@
+module PikaQue
+  module Handlers
+
+    autoload :DefaultHandler, 'pika_que/handlers/default_handler'
+    autoload :ErrorHandler, 'pika_que/handlers/error_handler'
+    autoload :RetryHandler, 'pika_que/handlers/retry_handler'
+
+  end
+end

data/lib/pika_que/publisher.rb

@@ -1,8 +1,11 @@
+require 'pika_que/util'
+
 module PikaQue
   class Publisher
 
     def initialize(opts = {})
-      @opts = PikaQue.config.merge(opts)
+      @opts = PikaQue.config.merge(opts) 
+      @codec = PikaQue::Util.constantize(@opts[:codec])
       @connection = @opts[:connection] || PikaQue.connection
       @channel = @connection.create_channel
       @exchange = @channel.exchange(@opts[:exchange], @opts[:exchange_options])
@@ -10,10 +13,9 @@ module PikaQue
 
     def publish(msg, options = {})
       to_queue = options.delete(:to_queue)
-      codec = @opts[:codec]
       options[:routing_key] ||= to_queue
-      options[:content_type] ||= codec.content_type
-      msg = codec.encode(msg)
+      options[:content_type] ||= @codec.content_type
+      msg = @codec.encode(msg)
       
       PikaQue.logger.info {"publishing <#{msg}> to [#{options[:routing_key]}]"}
       @exchange.publish(msg, options)

data/lib/pika_que/rails.rb

@@ -33,8 +33,6 @@ module PikaQue
         worker_files = []
       end
 
-      # TODO options, etc
-
       PIKA_QUE_CONFIG['processors'].each do |processor|
         workers = []
         processor['workers'].each do |worker|
@@ -53,8 +51,9 @@ module PikaQue
           ) unless worker_files.detect{ |w| w =~ /#{worker_name.underscore}/ }
           workers << worker_name
         end
-        proc_args = { workers: workers }
-        proc_args[:processor] = processor['processor'] if processor['processor']
+        proc_args = processor.symbolize_keys
+        proc_args[:workers] = workers
+        PikaQue.logger.info "Adding rails processor: #{proc_args}"
         PikaQue.config.add_processor(proc_args)
       end
     end

data/lib/pika_que/subscriber.rb

@@ -1,5 +1,6 @@
 require 'pika_que/reporters'
 require 'pika_que/metrics'
+require 'pika_que/util'
 
 module PikaQue
   class Subscriber
@@ -11,7 +12,7 @@ module PikaQue
 
     def initialize(opts = {})
       @opts = PikaQue.config.merge(opts)
-      @codec = @opts[:codec]
+      @codec = PikaQue::Util.constantize(@opts[:codec])
       @broker = @opts[:broker] || PikaQue::Broker.new(nil, @opts).tap{ |b| b.start }
       @pool = @opts[:worker_pool] || Concurrent::FixedThreadPool.new(@opts[:concurrency] || 1)
     end
@@ -21,8 +22,9 @@ module PikaQue
     end
 
     def setup_handler(handler_class, handler_opts)
-      @handler = broker.handler(handler_class, handler_opts)
+      @handler = broker.handler(handler_class, @opts[:handler_options].merge(handler_opts || {}))
       # TODO use routing keys?
+      logger.info "binding queue #{@queue.name} to handler #{@handler.class}"
       @handler.bind_queue(@queue, @queue.name)
     end
 
@@ -34,8 +36,8 @@ module PikaQue
           error = nil
           begin
             decoded_msg = @codec.decode(msg)
-            metrics.measure("work.#{self.class.name}.time") do
-              PikaQue.middleware.invoke(self, delivery_info, metadata, decoded_msg) do
+            metrics.measure("work.#{worker.class.name}.time") do
+              PikaQue.middleware.invoke(worker, delivery_info, metadata, decoded_msg) do
                 res = worker.work(delivery_info, metadata, decoded_msg)
               end
             end
@@ -49,15 +51,15 @@ module PikaQue
           if @opts[:ack]
             begin
               handler.handle(res, broker.channel, delivery_info, metadata, msg, error)
-              metrics.increment("work.#{self.class.name}.handled.#{res}") 
+              metrics.increment("work.#{worker.class.name}.handled.#{res}") 
             rescue => handler_err
               notify_reporters(handler_err, handler.class, msg)
-              metrics.increment("work.#{self.class.name}.handler.error") 
+              metrics.increment("work.#{worker.class.name}.handler.error") 
             end
           else
-            metrics.increment("work.#{self.class.name}.handled.noop") 
+            metrics.increment("work.#{worker.class.name}.handled.noop") 
           end
-          metrics.increment("work.#{self.class.name}.processed")
+          metrics.increment("work.#{worker.class.name}.processed")
         end
       end
     end

data/lib/pika_que/util.rb

@@ -3,7 +3,7 @@ module PikaQue
     extend self
     
     def constantize(str)
-      return str if str.is_a? Class
+      return str if (str.is_a?(Class) || str.is_a?(Module))
 
       names = str.split('::')
       names.shift if names.empty? || names.first.empty?

data/lib/pika_que/version.rb

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

data/lib/pika_que/worker.rb

@@ -4,7 +4,7 @@ module PikaQue
   module Worker
 
     def initialize(opts = {})
-      @subscriber = PikaQue::Subscriber.new(opts)
+      @subscriber = PikaQue::Subscriber.new(opts.merge(self.class.local_config || {}))
     end
 
     def prepare
@@ -52,17 +52,17 @@ module PikaQue
       attr_reader :handler_class
       attr_reader :handler_opts
       attr_reader :priority
-      attr_reader :config
+      attr_reader :local_config
 
       def from_queue(q, opts={})
         @queue_name = q.to_s
         @priority = opts.delete(:priority)
-        @queue_opts = PikaQue.config[:queue_options].merge(opts)
+        @queue_opts = opts
       end
 
       def handle_with(handler, opts={})
         @handler_class = handler
-        @handler_opts = PikaQue.config[:handler_options].merge(opts)
+        @handler_opts = opts
       end
 
       def enqueue(msg, opts={})
@@ -83,14 +83,14 @@ module PikaQue
       end
       alias_method :perform_at, :enqueue
 
-      def config(opts={})
-        @config = opts
+      def config(opts)
+        @local_config = opts
       end
 
       private
 
       def publisher
-        @publisher ||= PikaQue::Publisher.new(config || {})
+        @publisher ||= PikaQue::Publisher.new(local_config || {})
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pika_que
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dong Wook Koo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -126,6 +126,7 @@ files:
 - lib/pika_que.rb
 - lib/pika_que/broker.rb
 - lib/pika_que/cli.rb
+- lib/pika_que/codecs.rb
 - lib/pika_que/codecs/json.rb
 - lib/pika_que/codecs/noop.rb
 - lib/pika_que/codecs/rails.rb
@@ -133,6 +134,7 @@ files:
 - lib/pika_que/connection.rb
 - lib/pika_que/delay_worker.rb
 - lib/pika_que/errors.rb
+- lib/pika_que/handlers.rb
 - lib/pika_que/handlers/default_handler.rb
 - lib/pika_que/handlers/delay_handler.rb
 - lib/pika_que/handlers/error_handler.rb