serial_scheduler 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b855f319188736942eaaf5c84dc08d5086a4f60d8514e8399551113786ddad79
-  data.tar.gz: bfc620ad6f8420cae7d075e90a21f621973df3a255d5790d95d63fc464936bb0
+  metadata.gz: a3176f9491c9ca41665e74892f0ec5cca612b2590ef5d259eb595f03e3a80c1a
+  data.tar.gz: 182974bb8a089dc7c229eaa9a23294f88cea9d17b5eaca68f8a98cc9b0fe6bc6
 SHA512:
-  metadata.gz: 5456139c9c0be079b948f019524b8a174741a36eaf1262e88aeeb0c4007962f60fff671aaafc663cf53485e4181b1eb801d57b97f98c33d08aa18c637e72df18
-  data.tar.gz: 8efded31e1e11097706afdf0660bf489c11119d6cc81f1ab3c4f0c16a33ec9454080b848636df69fa253dd8e50dbdf13ca681c839f3a8c21bd0664c5295935be
+  metadata.gz: 4f33dd9831bea10233bac83fb3dfec909ef297f5f78254dea7e87babd6191210da35c81e572762292238258d0a95faf161d957c70d6cca688bedda3e5b8cb461
+  data.tar.gz: 5210390830383771b3fdcc69756116fd644f452e58b2c41ac6cfe3ef981329ac09c5792f3a6b0faefb8599652051dcfe4bbee4c5802ad5ab059a240509a80cfd

data/lib/serial_scheduler/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class SerialScheduler
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/serial_scheduler.rb

@@ -5,6 +5,44 @@ require 'json'
 require 'logger'
 
 class SerialScheduler
+  class Producer
+    attr_reader :name, :next, :timeout, :block
+
+    def initialize(name, interval: nil, timeout:, cron: nil, &block)
+      if cron
+        cron = Fugit.do_parse_cron(cron)
+      elsif !interval || interval < 1 || !interval.is_a?(Integer)
+        raise ArgumentError
+      end
+
+      @name = name
+      @interval = interval
+      @cron = cron
+      @timeout = timeout
+      @block = block
+      @next = nil
+    end
+
+    def start(now)
+      @next =
+        if @cron
+          @cron.next_time(Time.at(now)).to_i
+        else
+          # interval 1s: do not wait
+          # interval 1d: if we are 1 hour into the day next execution is in 23 hours
+          now + (@interval - (now % @interval) - 1)
+        end
+    end
+
+    def next!
+      if @cron
+        @next = @cron.next_time(Time.at(@next)).to_i
+      else
+        @next += @interval
+      end
+    end
+  end
+
   def initialize(logger: Logger.new(STDOUT), error_handler: ->(e) { raise e })
     @logger = logger
     @error_handler = error_handler
@@ -14,24 +52,21 @@ class SerialScheduler
   end
 
   # start a new thread that enqueues an execution at given interval
-  def add(name, interval:, timeout:, &block)
-    raise ArgumentError if interval < 1 || !interval.is_a?(Integer)
-
-    @producers << { name: name, interval: interval, timeout: timeout, block: block, next: 0 }
+  def add(*args, &block)
+    @producers << Producer.new(*args, &block)
   end
 
   def run
-    # interval 1s: do not wait
-    # interval 1d: if we are 1 hour into the day next execution is in 23 hours
     now = Time.now.to_i
-    @producers.each { |p| p[:next] = now + (p[:interval] - (now % p[:interval]) - 1) }
+    @producers.each { |p| p.start now }
 
     loop do
-      earliest = @producers.min_by { |p| p[:next] }
-      wait = [earliest[:next] - Time.now.to_i, 0].max
+      now = Time.now.to_i
+      earliest = @producers.min_by(&:next)
+      wait = [earliest.next - now, 0].max # do not wait when overdue
 
       if wait > 0
-        @logger.info message: "Waiting to start job", job: earliest[:name], time: wait
+        @logger.info message: "Waiting to start job", job: earliest.name, time: wait, at: Time.at(now).to_s
         wait.times do
           break if @stopped
 
@@ -40,7 +75,7 @@ class SerialScheduler
       end
       break if @stopped
 
-      earliest[:next] += earliest[:interval]
+      earliest.next!
       execute_in_fork earliest
     end
   end
@@ -52,12 +87,12 @@ class SerialScheduler
   private
 
   def execute_in_fork(producer)
-    @logger.info message: "Executing job", job: producer[:name]
+    @logger.info message: "Executing job", job: producer.name
     pid = fork do
       begin
-        Timeout.timeout producer[:timeout], &producer[:block]
+        Timeout.timeout producer.timeout, &producer.block
       rescue StandardError => e # do not rescue `Exception` so it can be `Interrupt`-ed
-        @logger.error message: "Error in job", job: producer[:name], error: e.message
+        @logger.error message: "Error in job", job: producer.name, error: e.message
         @error_handler.call(e)
       end
     end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: serial_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
-dependencies: []
+date: 2020-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fugit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: michael@grosser.it
 executables: []
@@ -38,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple scheduler for long-running and infrequent tasks, no threads, always