rufus-scheduler 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec88a5f600474172a07002ec7a17c2b35cd9aeffff3e2cfe9865e49e0c9a6d7
-  data.tar.gz: ca607aef24a501fd1a23370e230c6481fe8624c6111c79b11f7f59fc5edc5884
+  metadata.gz: 9fbe0f73068129b96196031b141f480f830e3110e35d3c5eaa2206530b1ae536
+  data.tar.gz: bec310a43820928b8d342b5b3602edf8cb27aaca8995e0a18073d70dfd3839f8
 SHA512:
-  metadata.gz: 0e2535642cb251105341e3d70998500f86370d41b13a6841698e15bc729d5d94ec420cfa4dc4549794ff53b82e442ae61962a61f10751a10c303f21a991d4cfc
-  data.tar.gz: bdfe0713a8b5bbec83403dbc1232f5bd310579707fd7b838a224367bc4cdd34752defc47f9cc1bb0686267c3a4b49114490866d6b8dcde22ce6ec3c52479ea90
+  metadata.gz: 3e8edfd4df2ddbb0f8026ffa13fff69f9f4bd045da1638fe5ac38610992e0f7d173b20a27ad1833760d6fee62d41b5b160978e107dbc55a1b9d07dfaa62444ad
+  data.tar.gz: 412bb7e80546c5cd13bf8875f928ce6920a9e62774d296db83935adbfee56069cbb2729bb4640962351297cd55b8b5cfb92facfec38e7cb92b3ef9f7446c7283

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+### rufus-scheduler 3.8.2 - released 2022-07-12
+
+* Prevent error in shutdown when @thread is current Thread, gh-337
+* Rescue errors on the scheduling thread, gh-335
+
+
 ### rufus-scheduler 3.8.1 - released 2022-01-11
 
 * Suppress warning about @resume_discard_past

data/CREDITS.md

@@ -4,6 +4,10 @@
 
 ## Contributors
 
+* Bence Monus https://github.com/cromega gh-337 on_error and friends
+* Talia Wong https://github.com/blowfishpro gh-335 on_error and friends
+* Konstantin https://github.com/fa11enangel gh-334 nodejitsu link
+* Olle Jonsson https://github.com/olleolleolle gh-333
 * Sol Ackerman https://github.com/solarckerman gh-332
 * John Bachir https://github.com/jjb gh-310 gh-327
 * Daniel Berger https://github.com/djberg96 gh-300

data/README.md

@@ -133,7 +133,7 @@ Yes, issues can be reported in [rufus-scheduler issues](https://github.com/jmett
 ### faq
 
 * [It doesn't work...](https://www.chiark.greenend.org.uk/~sgtatham/bugs.html)
-* [I want a refund](https://blog.nodejitsu.com/getting-refunds-on-open-source-projects)
+* [I want a refund](https://web.archive.org/web/20160425034214/http://blog.nodejitsu.com/getting-refunds-on-open-source-projects/)
 * [Passenger and rufus-scheduler](https://stackoverflow.com/questions/18108719/debugging-rufus-scheduler/18156180#18156180)
 * [Passenger and rufus-scheduler (2)](https://stackoverflow.com/questions/21861387/rufus-cron-job-not-working-in-apache-passenger#answer-21868555)
 * [Passenger in-depth spawn methods](https://www.phusionpassenger.com/library/indepth/ruby/spawn_methods/)
@@ -860,7 +860,11 @@ require 'rufus-scheduler'
 s = Rufus::Scheduler.new
 
 def s.on_error(job, err)
-  p [ 'error in scheduled job', job.class, job.original, err.message ]
+  if job
+    p [ 'error in scheduled job', job.class, job.original, err.message ]
+  else
+    p [ 'error while scheduling', err.message ]
+  end
 rescue
   p $!
 end

data/lib/rufus/scheduler.rb

@@ -9,7 +9,7 @@ module Rufus; end
 
 class Rufus::Scheduler
 
-  VERSION = '3.8.1'
+  VERSION = '3.8.2'
 
   EoTime = ::EtOrbi::EoTime
 
@@ -443,10 +443,14 @@ class Rufus::Scheduler
     ms = {}; mutexes.each { |k, v| ms[k] = v.locked? }
 
     stderr.puts("{ #{pre} rufus-scheduler intercepted an error:")
-    stderr.puts("  #{pre}   job:")
-    stderr.puts("  #{pre}     #{job.class} #{job.original.inspect} #{job.opts.inspect}")
-    stderr.puts("  #{pre}     #{job.source_location.inspect}")
-    # TODO: eventually use a Job#detail or something like that
+    if job
+      stderr.puts("  #{pre}   job:")
+      stderr.puts("  #{pre}     #{job.class} #{job.original.inspect} #{job.opts.inspect}")
+      stderr.puts("  #{pre}     #{job.source_location.inspect}")
+      # TODO: eventually use a Job#detail or something like that
+    else
+      stderr.puts("  #{pre}   job: (error did not occur in a job)")
+    end
     stderr.puts("  #{pre}   error:")
     stderr.puts("  #{pre}     #{err.object_id}")
     stderr.puts("  #{pre}     #{err.class}")
@@ -530,7 +534,7 @@ class Rufus::Scheduler
 
     unlock
 
-    @thread.join
+    @thread.join unless @thread == Thread.current
   end
   alias stop shutdown
 
@@ -630,12 +634,20 @@ class Rufus::Scheduler
       Thread.new do
 
         while @started_at do
+          begin
+
+            unschedule_jobs
+            trigger_jobs unless @paused_at
+            timeout_jobs
 
-          unschedule_jobs
-          trigger_jobs unless @paused_at
-          timeout_jobs
+            sleep(@frequency)
 
-          sleep(@frequency)
+          rescue => err
+            #
+            # for `blocking: true` jobs mostly
+            #
+            on_error(nil, err)
+          end
         end
 
         rejoin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit