serial_scheduler 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3176f9491c9ca41665e74892f0ec5cca612b2590ef5d259eb595f03e3a80c1a
-  data.tar.gz: 182974bb8a089dc7c229eaa9a23294f88cea9d17b5eaca68f8a98cc9b0fe6bc6
+  metadata.gz: 7b83a00e72a7ae3fd8db2f2ee0e7096b893bd518f018c8698170d4803819efee
+  data.tar.gz: d68d671f5e1bd8fc10158b7e81288f6c81de5ca9f184ad4b2cb029f3c4879c94
 SHA512:
-  metadata.gz: 4f33dd9831bea10233bac83fb3dfec909ef297f5f78254dea7e87babd6191210da35c81e572762292238258d0a95faf161d957c70d6cca688bedda3e5b8cb461
-  data.tar.gz: 5210390830383771b3fdcc69756116fd644f452e58b2c41ac6cfe3ef981329ac09c5792f3a6b0faefb8599652051dcfe4bbee4c5802ad5ab059a240509a80cfd
+  metadata.gz: 98d7363dd9ff8f7d23e9ed47e638d1daa4801f01fe9dce51881762ec6d3d97c351e0d5f31de2c7b5c9356bab674be28750897b21ba4b707d2824c667bb9f90c9
+  data.tar.gz: 5705053102ec7bc24cbad873fd2814661cdf9c04108873e37ddcdfded053f895c02dab3dc5a53bca466d13a3119042080f77519d817850aa5696b6d0f14d4177

data/lib/serial_scheduler/version.rb

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

data/lib/serial_scheduler.rb

@@ -8,7 +8,7 @@ class SerialScheduler
   class Producer
     attr_reader :name, :next, :timeout, :block
 
-    def initialize(name, interval: nil, timeout:, cron: nil, &block)
+    def initialize(name, timeout:, interval: nil, cron: nil, &block)
       if cron
         cron = Fugit.do_parse_cron(cron)
       elsif !interval || interval < 1 || !interval.is_a?(Integer)
@@ -43,7 +43,7 @@ class SerialScheduler
     end
   end
 
-  def initialize(logger: Logger.new(STDOUT), error_handler: ->(e) { raise e })
+  def initialize(logger: Logger.new($stdout), error_handler: ->(e) { raise e })
     @logger = logger
     @error_handler = error_handler
 
@@ -52,8 +52,8 @@ class SerialScheduler
   end
 
   # start a new thread that enqueues an execution at given interval
-  def add(*args, &block)
-    @producers << Producer.new(*args, &block)
+  def add(*args, **kwargs, &block)
+    @producers << Producer.new(*args, **kwargs, &block)
   end
 
   def run
@@ -64,11 +64,12 @@ class SerialScheduler
       now = Time.now.to_i
       earliest = @producers.min_by(&:next)
       wait = [earliest.next - now, 0].max # do not wait when overdue
+      target = Time.at(now + wait)
 
       if wait > 0
-        @logger.info message: "Waiting to start job", job: earliest.name, time: wait, at: Time.at(now).to_s
-        wait.times do
-          break if @stopped
+        @logger.info message: "Waiting to start job", job: earliest.name, in: wait, at: target.to_s
+        loop do
+          break if @stopped || Time.now >= target # need to re-check or long waits will drift by .3%
 
           sleep 1
         end
@@ -89,12 +90,10 @@ class SerialScheduler
   def execute_in_fork(producer)
     @logger.info message: "Executing job", job: producer.name
     pid = fork do
-      begin
-        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
-        @error_handler.call(e)
-      end
+      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
+      @error_handler.call(e)
     end
     Process.wait pid
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serial_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -45,14 +45,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Simple scheduler for long-running and infrequent tasks, no threads, always