procrastinator 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0509c58df91713253273b49ffe9bcb247877399
-  data.tar.gz: 7b74c00c0400fb5a2d29a2dd41ed35a5ec22e5a1
+  metadata.gz: 9ffc8c7bca7bcfddac8f0b86e428920ad3c12554
+  data.tar.gz: e68d47728ebcedda262ed1c7e3843162a64feb05
 SHA512:
-  metadata.gz: 3195a78dc76f9eacb7334f0f4fe2bb00d378e5179255a145ed0ef6956db34ecc50aed2dc54ca5f00d2497d2440d591f00ba559d617d4b538f253fa1d2c370e7b
-  data.tar.gz: a1bd2be7c63829e0e7f0d0d16ffc1be37fa9309a3abddc05fa8f7ab8dd6767d18e5d0868583aa1a1294b9cb935e729a1d78ea46f7a29837dd22a73df373fadab
+  metadata.gz: c74017a1c0d6dab41e5fbd7f7ef8c20fe61b8dc284b1e1ef72a856fed0123f450bca2144d5f8bdeff33b6de60f3b0c8acae677fb43f28236358244dc704bc3f0
+  data.tar.gz: 1e43eb8665474cfd59c29a12721f25b6ebe4134ead5fa89114d9631cabe227ed6f37a4e318ab6004a0493b615ed9407f402778e619eebc954e80e9bf4b6e9756

data/lib/procrastinator/environment.rb

@@ -30,8 +30,7 @@ module Procrastinator
          if @test_mode
             @queue_definitions.each do |name, props|
                @queue_workers << QueueWorker.new(props.merge(name:      name,
-                                                             persister: @persister,
-                                                             log_dir:   @log_dir))
+                                                             persister: @persister))
             end
          else
             @queue_definitions.each do |name, props|
@@ -41,8 +40,6 @@ module Procrastinator
                                                        log_dir:   @log_dir,
                                                        log_level: @log_level))
 
-                  worker.start_log
-
                   Process.setproctitle("#{@process_prefix ? "#{@process_prefix}-" : ''}#{worker.long_name}") # tODO: add an app name prefix
 
                   monitor_parent(worker)

data/lib/procrastinator/queue_worker.rb

@@ -31,20 +31,27 @@ module Procrastinator
          @persister     = persister
          @log_dir       = log_dir
          @log_level     = log_level
+
+         start_log
       end
 
       def work
-         loop do
-            sleep(@update_period)
+         begin
+            loop do
+               sleep(@update_period)
 
-            act
+               act
+            end
+         rescue StandardError => e
+            @logger.fatal(e)
+               # raise e
          end
       end
 
       def act
-         # shuffling and re-sorting to avoid worst case O(n^2) on quicksort
+         # shuffling and re-sorting to avoid worst case O(n^2) on quicksort (which is default ruby sort)
          # when receiving already sorted data. Ideally, we'd use a better algo, but this will do for now
-         tasks = @persister.read_tasks(@name).shuffle.sort_by { |t| t[:run_at] || 0 }
+         tasks = @persister.read_tasks(@name).reject { |t| t[:run_at].nil? }.shuffle.sort_by { |t| t[:run_at] }
 
          tasks.first(@max_tasks).each do |task_data|
             if Time.now.to_i >= task_data[:run_at].to_i

data/lib/procrastinator/task_worker.rb

@@ -16,7 +16,7 @@ module Procrastinator
                      task:,
                      logger: Logger.new(StringIO.new))
          @id             = id
-         @run_at         = run_at.to_i
+         @run_at         = run_at.nil? ? nil : run_at.to_i
          @initial_run_at = initial_run_at.to_i
          @expire_at      = expire_at.nil? ? nil : expire_at.to_i
          @task           = YAML.load(task)

data/lib/procrastinator/version.rb

@@ -1,3 +1,3 @@
 module Procrastinator
-   VERSION = '0.4.1'
+   VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procrastinator
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Robin Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler