hutch-schedule 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a7154c024537201d32af0ad6d88c5b2a44e7cb
-  data.tar.gz: 61a4bf23ad9d4cdb31e6c3cd9ecf18a174a47196
+  metadata.gz: e7d6b5d5d9762d162619d53eccc098a2a3653ba1
+  data.tar.gz: 1b0429efd64d15707587387e786d5f0b59c11b77
 SHA512:
-  metadata.gz: c7ae43fbac466b5a439e8d09c297913cfb6f170147bbab7dc9e767e6f3a0b43c1a32c730d24326938aaa9630a0ca18b5e09a094b396855646c78879dd8082515
-  data.tar.gz: ef62aa365fa12551114e2949d547b03b44d22640cde958a902b058de42371d4b2a4ddc2c96da4bf491fc0f4489c731bbfe7cfb3ca463fddf83ac324413f6627f
+  metadata.gz: f6216f7715530d9bfb291cb752c4804cccd72857611d41c32d00dbb25a1655b4681a92c0b1cd6545e0bbfcc69bf0f07436b437b936bf2046b0740ec10a9134c8
+  data.tar.gz: d76aa10fd7819f7cbd7765343f036c01dbbca0a05709e6581af049a4876c1ac3096d033cd70679c9f1d8d2538d0d73ccde36e7f045afbf8fd71c11987c9cc1b9

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [0.4.2] - 2017-05-23
+### Fixed
+- Reuse consumer when register ActiveJob queue to consumer
+
+
+## [0.4.1] - 2017-05-22
+### Fixed
+- When register ActiveJob queue consumer, use job instance #queue_name not job class queue_name
+
+## [0.4.0] - 2017-05-21
+### Fixed
+- Fix Hutch::ErrorsHandler::MaxRetry use Set#intersect? instead of Array#include? to 
+calculate routing_key diff and aggregate message faild times.
+

data/lib/active_job/queue_adapters/hutch_adapter.rb

@@ -43,6 +43,7 @@ module ActiveJob
 
       # Register all ActiveJob Class to Hutch. (per queue per consumer)
       def self.register_actice_job_classes
+        # TODO: 需要考虑如何将 AJ 的 Proc queue_name 动态注册到 Hutch
         queue_consumers = {}
 
         Dir.glob(Rails.root.join('app/jobs/**/*.rb')).each { |x| require_dependency x }
@@ -52,7 +53,7 @@ module ActiveJob
           # Multi queue only have one consumer
           next if queue_consumers.key?(job.queue_name)
           queue_consumers[job.queue_name] = HutchAdapter.dynamic_consumer(job)
-          Hutch.consumers << queue_consumers[job.queue_name]
+          Hutch.register_consumer(queue_consumers[job.queue_name])
         end
       end
 
@@ -66,13 +67,17 @@ module ActiveJob
           queue_name job_instance.queue_name
           consume HutchAdapter.routing_key(job_instance)
 
-          define_method :process do |job_data|
+          def process(job_data)
             ActiveJob::Base.execute(job_data)
           end
 
+          define_singleton_method :name do
+            "#{job_instance.queue_name}_dynamic_consumer".camelize
+          end
+
           # inspect name
-          define_method :inspect do
-            "#{job_instance.queue_name}-anonymous-consumer"
+          define_singleton_method :inspect do
+            "#{job_instance.queue_name}_dynamic_consumer".camelize
           end
         end
       end

data/lib/hutch/schedule.rb

@@ -16,10 +16,10 @@ module Hutch
   # and then just use like Hutch to publish message `Hutch::Schedule.publish`
   module Schedule
 
-    def self.connect(broker = Hutch.broker)
-      raise "Please invoke Hutch.connect before Hutch::Schedule.connect, Hutch::Schedule need Hutch.broker" unless Hutch.connected?
+    def self.connect
       return if core.present?
-      @core = Hutch::Schedule::Core.new(broker)
+      Hutch.connect unless Hutch.connected?
+      @core = Hutch::Schedule::Core.new(Hutch.broker)
       @core.connect!
       ActiveJob::QueueAdapters::HutchAdapter.register_actice_job_classes if defined?(ActiveJob::QueueAdapters::HutchAdapter)
     end

data/lib/hutch/schedule/core.rb

@@ -39,7 +39,6 @@ module Hutch
 
       def declare_exchange(ch = channel)
         exchange_name    = "#{config[:mq_exchange]}.schedule"
-        # TODO: Check mq_exchange_options info, ensure they won`t override x-dead-letter-exchange params
         exchange_options = { durable: true }.merge(config[:mq_exchange_options])
         logger.info "using topic exchange(schedule) '#{exchange_name}'"
 
@@ -54,7 +53,6 @@ module Hutch
         props = { 'x-message-ttl': 30.days.in_milliseconds, 'x-dead-letter-exchange': config[:mq_exchange] }
         queue = broker.queue("#{config[:mq_exchange]}_schedule_queue", props)
 
-        # TODO: consider extract this routing_key params to config params
         # routing all to this queue
         queue.unbind(exchange, routing_key: '#')
         queue.bind(exchange, routing_key: '#')

data/lib/hutch/schedule/version.rb

@@ -1,5 +1,5 @@
 module Hutch
   module Schedule
-    VERSION = "0.4.2"
+    VERSION = "0.4.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch-schedule
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Wyatt pan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hutch
@@ -119,6 +119,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt