hutch-schedule 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39d9fb10e3c0a56ec9b631c740a24b377ed7c58
-  data.tar.gz: c1954bbbe01856982cd21e7e522ebbc30b6c086d
+  metadata.gz: c3c90439f10d883825f1ca1b9dbf5bbfcf0aca7c
+  data.tar.gz: fb5932ac34591240d31c453ab97fa91ce2db1979
 SHA512:
-  metadata.gz: eded10acdb13ed5bfc9b620cc686c6f82c36ac083d0b03b38362cc96e46d91942e45a863992e317a3b609bbd9ec5437ccb43f16186ce2b2f0fc1f9f7ab5b5dc2
-  data.tar.gz: 66c135271fc10dd710ec7ac4dcc8b220d6de476254f4216c9071f8f85bbd198abf0424b40a374dbec1b7d3bc0961296d7410497fd328c9bac4839f6d19da6d63
+  metadata.gz: 042f54b09184cd3e22b28fca4d7b0aa64c8a62e75cb6970b2b3ec65a09af24934ad04b2ad0ce9b9e980757019cea471c0119571c3a63deeab55cb7905fba1e92
+  data.tar.gz: 11e92d105f86cefa0ecbade21ccb784dd4648385fb2ccdcd378056d008c51aa4a1382920f044ca11d3a08b59047dba6c954703566e3eda7f8a07a9baf8dcb27a

data/lib/active_job/queue_adapters/hutch_adapter.rb

@@ -11,6 +11,7 @@ module ActiveJob
       # All activejob Message will routing to one RabbitMQ Queue.
       # Because Hutch will one Consumer per Queue
       AJ_ROUTING_KEY = "active_job"
+      @@queue_consumers = {}
 
       def initialize
         @monitor = Monitor.new
@@ -18,21 +19,13 @@ module ActiveJob
 
       def enqueue(job) #:nodoc:
         @monitor.synchronize do
-          # publish all job data to hutch
-          Hutch.publish(HutchAdapter.routing_key(job), job.serialize)
+          @@queue_consumers[job.queue_name].enqueue(job.serialize)
         end
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
-        interval = [(timestamp - Time.now.utc.to_i), 1.second].max
-        enqueue_in(interval, job.serialize, HutchAdapter.routing_key(job))
-      end
-
-      def enqueue_in(interval, message, routing_key)
         @monitor.synchronize do
-          # must be integer
-          props = { expiration: interval.in_milliseconds.to_i }
-          Hutch::Schedule.publish(routing_key, message, props)
+          @@queue_consumers[job.queue_name].enqueue_at(timestamp, job.serialize)
         end
       end
 
@@ -44,23 +37,23 @@ 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 }
         ActiveJob::Base.descendants.each do |job_clazz|
           # Need activeJob instance #queue_name
           job = job_clazz.new
           # Multi queue only have one consumer
-          next if queue_consumers.key?(job.queue_name)
-          queue_consumers[job.queue_name] = HutchAdapter.dynamic_consumer(job)
-          Hutch.register_consumer(queue_consumers[job.queue_name])
+          next if @@queue_consumers.key?(job.queue_name)
+          @@queue_consumers[job.queue_name] = HutchAdapter.dynamic_consumer(job)
+          Hutch.register_consumer(@@queue_consumers[job.queue_name])
         end
       end
 
       private
       def self.dynamic_consumer(job_instance)
         Class.new do
+          # don't include Hutch::Consumer, we should change the name of consumer to registe
           extend Hutch::Consumer::ClassMethods
+          include Hutch::Enqueue
 
           attr_accessor :broker, :delivery_info
 

data/lib/hutch/enqueue.rb

@@ -30,8 +30,10 @@ module Hutch
 
       # delay at exatly time point
       def enqueue_at(time, message, props = {})
+        # compatible with with ActiveJob API
+        time_or_timestamp = time.respond_to?(:utc) ? time.utc.to_f : time
         # if time is early then now then just delay 1 second
-        interval = [(time.utc - Time.now.utc), 1.second].max
+        interval = [(time_or_timestamp - Time.now.utc.to_f), 1.second].max
         enqueue_in(interval, message, props)
       end
 

data/lib/hutch/schedule.rb

@@ -24,11 +24,12 @@ module Hutch
 
     class << self
       def connect
+        ActiveJob::QueueAdapters::HutchAdapter.register_actice_job_classes if defined?(ActiveJob::QueueAdapters::HutchAdapter)
+        
         return if core.present?
         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
 
       def core

data/lib/hutch/schedule/version.rb

@@ -1,5 +1,5 @@
 module Hutch
   module Schedule
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch-schedule
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Wyatt pan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hutch