mini_scheduler 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58dcad532f7cb76d214c67d975f8d803dbf915af17cf22ec71e8ce682cd49d39
-  data.tar.gz: a52d4cd05cabea3cdea11aea43b89f4a098526bb2a441b0f054d4ef03b469159
+  metadata.gz: 61de19d47b5090c36a179869a01800506ee364629db64f47df963426c1d9a8b6
+  data.tar.gz: faa1b86a2d625fa570b26dd8ad8a2ccdb15fcd6029f1d93ad67ddefb0301342a
 SHA512:
-  metadata.gz: ea0b767e1a6751175f904e5f13a5165ff79cc6bd226ec1a140df0591290793c4bb4c8d2d0eeb2a52b390bd43e1b14784fe31c58f3a45d699bd679b44a62cc794
-  data.tar.gz: fa328b9320451df465d6067fb6adaa6325680fafef660a6fada896079afdd38b74010ba28ed7191779f59164b0db45e32aaf14f1c4d03603ea5382bf9dc8d1cd
+  metadata.gz: 931ae1731d9c1b49b3c861ec5b401d317e436f9548494c6fc9cd7b242c5d9bd932459bdf5598f9e7ca24abe8c46d585a43d75cac8a2772f7a04bc77fcf6ad27d
+  data.tar.gz: 82ef45be2249b8c5d6834aeeb13f3f72e4b23604436a68246bba46350ad49255d0f9adf6ac262f685c189d9fc6670c8247776ab3b2d4eaf1f9b7e55b87a63515

data/README.md

@@ -49,6 +49,7 @@ end
 
 Options for schedules:
 
+* **queue** followed by a queue name, like "queue :email", default queue is "default"
 * **every** followed by a duration in seconds, like "every 1.hour".
 * **daily at:** followed by a duration since midnight, like "daily at: 12.hours", to run only once per day at a specific time.
 

data/lib/mini_scheduler.rb

@@ -52,24 +52,30 @@ module MiniScheduler
   end
 
   def self.start
-    manager = Manager.new
+    schedules = Manager.discover_schedules
 
-    Manager.discover_schedules.each do |schedule|
-      manager.ensure_schedule!(schedule)
-    end
+    Manager.discover_queues.each do |queue|
+      manager = Manager.new(queue: queue)
 
-    Thread.new do
-      while true
-        begin
-          if !self.skip_schedule || !self.skip_schedule.call
-            manager.tick
-          end
-        rescue => e
-          # the show must go on
-          handle_job_exception(e, message: "While ticking scheduling manager")
+      schedules.each do |schedule|
+        if schedule.queue == queue
+          manager.ensure_schedule!(schedule)
         end
+      end
 
-        sleep 1
+      Thread.new do
+        while true
+          begin
+            if !self.skip_schedule || !self.skip_schedule.call
+              manager.tick
+            end
+          rescue => e
+            # the show must go on
+            handle_job_exception(e, message: "While ticking scheduling manager")
+          end
+
+          sleep 1
+        end
       end
     end
   end

data/lib/mini_scheduler/manager.rb

@@ -1,6 +1,6 @@
 module MiniScheduler
   class Manager
-    attr_accessor :random_ratio, :redis, :enable_stats
+    attr_accessor :random_ratio, :redis, :enable_stats, :queue
 
     class Runner
       def initialize(manager)
@@ -168,11 +168,13 @@ module MiniScheduler
     end
 
     def initialize(options = nil)
+      @queue = options && options[:queue] || "default"
+
       @redis = MiniScheduler.redis
       @random_ratio = 0.1
       unless options && options[:skip_runner]
         @runner = Runner.new(self)
-        self.class.current = self
+        self.class.current[@queue] = self
       end
 
       @hostname = options && options[:hostname]
@@ -186,11 +188,7 @@ module MiniScheduler
     end
 
     def self.current
-      @current
-    end
-
-    def self.current=(manager)
-      @current = manager
+      @current ||= {}
     end
 
     def hostname
@@ -225,7 +223,7 @@ module MiniScheduler
     end
 
     def reschedule_orphans_on!(hostname = nil)
-      redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key|
+      redis.zrange(Manager.queue_key(queue, hostname), 0, -1).each do |key|
         klass = get_klass(key)
         next unless klass
         info = schedule_info(klass)
@@ -253,14 +251,14 @@ module MiniScheduler
     end
 
     def schedule_next_job(hostname = nil)
-      (key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true
+      (key, due), _ = redis.zrange Manager.queue_key(queue, hostname), 0, 0, withscores: true
       return unless key
 
       if due.to_i <= Time.now.to_i
         klass = get_klass(key)
         unless klass
           # corrupt key, nuke it (renamed job or something)
-          redis.zrem Manager.queue_key(hostname), key
+          redis.zrem Manager.queue_key(queue, hostname), key
           return
         end
         info = schedule_info(klass)
@@ -281,7 +279,7 @@ module MiniScheduler
 
     def stop!
       @runner.stop!
-      self.class.current = nil
+      self.class.current.delete(@queue)
     end
 
     def keep_alive_duration
@@ -293,11 +291,15 @@ module MiniScheduler
     end
 
     def lock
-      MiniScheduler::DistributedMutex.synchronize(Manager.lock_key, MiniScheduler.redis) do
+      MiniScheduler::DistributedMutex.synchronize(Manager.lock_key(queue), MiniScheduler.redis) do
         yield
       end
     end
 
+    def self.discover_queues
+      ObjectSpace.each_object(MiniScheduler::Schedule).map(&:queue).to_set
+    end
+
     def self.discover_schedules
       # hack for developemnt reloader is crazytown
       # multiple classes with same name can be in
@@ -326,15 +328,15 @@ module MiniScheduler
       @identity_key ||= "_scheduler_#{hostname}:#{Process.pid}:#{self.class.seq}:#{SecureRandom.hex}"
     end
 
-    def self.lock_key
-      "_scheduler_lock_"
+    def self.lock_key(queue)
+      "_scheduler_lock_#{queue}_"
     end
 
-    def self.queue_key(hostname = nil)
+    def self.queue_key(queue, hostname = nil)
       if hostname
-        "_scheduler_queue_#{hostname}_"
+        "_scheduler_queue_#{queue}_#{hostname}_"
       else
-        "_scheduler_queue_"
+        "_scheduler_queue_#{queue}_"
       end
     end
 

data/lib/mini_scheduler/schedule.rb

@@ -1,5 +1,10 @@
 module MiniScheduler::Schedule
 
+  def queue(value = nil)
+    @queue = value.to_s if value
+    @queue ||= "default"
+  end
+
   def daily(options = nil)
     if options
       @daily = options
@@ -10,7 +15,7 @@ module MiniScheduler::Schedule
   def every(duration = nil)
     if duration
       @every = duration
-      if manager = MiniScheduler::Manager.current
+      if manager = MiniScheduler::Manager.current[queue]
         manager.ensure_schedule!(self)
       end
     end

data/lib/mini_scheduler/schedule_info.rb

@@ -120,9 +120,9 @@ module MiniScheduler
 
     def queue_key
       if @klass.is_per_host
-        Manager.queue_key(@manager.hostname)
+        Manager.queue_key(@manager.queue, @manager.hostname)
       else
-        Manager.queue_key
+        Manager.queue_key(@manager.queue)
       end
     end
 

data/lib/mini_scheduler/version.rb

@@ -1,3 +1,3 @@
 module MiniScheduler
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/lib/mini_scheduler/views/scheduler.erb

@@ -7,16 +7,17 @@
 <div class="container">
   <div class="row">
 
-    <div class="col-md-9">
+    <div class="col-md-12">
       <% if @schedules.length > 0 %>
       <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
         <thead>
           <th style="width: 30%">Worker</th>
-          <th style="width: 15%">Last Run</th>
-          <th style="width: 15%">Last Result</th>
-          <th style="width: 15%">Last Duration</th>
-          <th style="width: 15%">Last Owner</th>
-          <th style="width: 15%">Next Run Due</th>
+          <th style="width: 10%">Last Run</th>
+          <th style="width: 10%">Last Result</th>
+          <th style="width: 10%">Last Duration</th>
+          <th style="width: 10%">Last Owner</th>
+          <th style="width: 10%">Next Run Due</th>
+          <th style="width: 10%">Queue</th>
           <th style="width: 10%">Actions</th>
         </thead>
         <% @schedules.each do |schedule| %>
@@ -49,6 +50,9 @@
               <%= relative_time(Time.at(next_run)) %>
               <% end %>
             </td>
+            <td>
+              <%= schedule.queue %>
+            </td>
             <td>
               <form action="<%= "#{root_path}scheduler/#{schedule}/trigger" %>" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq