rocketjob 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665d894a78de154892a8c53e03f2a2a81f6230f9
-  data.tar.gz: d89dba90f39ef98f7205366b166a45d928fb84db
+  metadata.gz: a8f3f4b74a0c8fc21434e841b045e285474d2508
+  data.tar.gz: 9b1a0c551b00e0470f7f0cf524d0b24c493df900
 SHA512:
-  metadata.gz: c275f0ca475518de2acddce890b924312e8e40e5f04f74e2f4c8a235235723c5b1d3a322d0c10dd29d512f3d2f492b6c52d917b8a491185a18a61634ecfde174
-  data.tar.gz: 6f368bdd55d728530252d30d16a34b0b215caaa4cbe1a199b3aa1d369a48044cbd90642e2bec55fa039238897401a5223f67c56bbe7d02d98adea63e44f2b09e
+  metadata.gz: 36c29026484cb8f60930318609c94c31044231bb43c53cac55185f89b6479e5446a53522e49bac5bad86506988338fdca48b8f67b2094209b93a144c355d1ff8
+  data.tar.gz: 333637778b2cd085e5ea58b1852e57626859e8499918cfd48af4e2dfac893792c5f9619b42070ec0303209ef9287f9e50d281060a92f4e07bcd2461b434e3c6c

data/lib/rocket_job/cli.rb

@@ -70,6 +70,7 @@ module RocketJob
         logger.measure_info('Eager loaded Rails and all Engines') do
           Rails.application.eager_load!
           Rails::Engine.subclasses.each(&:eager_load!)
+          self.class.eager_load_jobs(File.expand_path('jobs', File.dirname(__FILE__)))
         end
       end
     end
@@ -96,6 +97,7 @@ module RocketJob
 
       logger.info "Rails not detected. Running standalone: #{environment}"
       RocketJob::Config.load!(environment, mongo_config, symmetric_encryption_config)
+      self.class.eager_load_jobs(File.expand_path('jobs', File.dirname(__FILE__)))
       self.class.eager_load_jobs
     end
 
@@ -136,7 +138,7 @@ module RocketJob
       Pathname.glob("#{path}/**/*.rb").each do |path|
         next if path.directory?
         logger.debug "Loading #{path.to_s}"
-        load path.expand_path.to_s
+        require path.expand_path.to_s
       end
     end
 

data/lib/rocket_job/plugins/state_machine.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'thread'
 require 'active_support/concern'
 require 'aasm'
 require 'rocket_job/extensions/aasm'
@@ -28,6 +29,7 @@ module RocketJob
     #  end
     module StateMachine
       extend ActiveSupport::Concern
+      @@aasm_mutex = Mutex.new
 
       included do
         include AASM
@@ -42,28 +44,30 @@ module RocketJob
           raise(ArgumentError, 'Cannot supply both a method name and a block') if (methods.size > 0) && block
           raise(ArgumentError, 'Must supply either a method name or a block') unless (methods.size > 0) || block
 
-          # TODO Somehow get AASM to support options such as :if and :unless to be consistent with other callbacks
-          # For example:
-          #    before_start :my_callback, unless: :encrypted?
-          #    before_start :my_callback, if: :encrypted?
-          if event = aasm.state_machine.events[event_name]
-            values = Array(event.options[action])
-            code   =
-              if block
-                block
-              else
-                # Validate methods are any of Symbol String Proc
-                methods.each do |method|
-                  unless method.is_a?(Symbol) || method.is_a?(String)
-                    raise(ArgumentError, "#{action}_#{event_name} currently does not support any options. Only Symbol and String method names can be supplied.")
+          @@aasm_mutex.synchronize do
+            # TODO Somehow get AASM to support options such as :if and :unless to be consistent with other callbacks
+            # For example:
+            #    before_start :my_callback, unless: :encrypted?
+            #    before_start :my_callback, if: :encrypted?
+            if event = aasm.state_machine.events[event_name]
+              values = Array(event.options[action])
+              code   =
+                if block
+                  block
+                else
+                  # Validate methods are any of Symbol String Proc
+                  methods.each do |method|
+                    unless method.is_a?(Symbol) || method.is_a?(String)
+                      raise(ArgumentError, "#{action}_#{event_name} currently does not support any options. Only Symbol and String method names can be supplied.")
+                    end
                   end
+                  methods
                 end
-                methods
-              end
-            action == :before ? values.push(code) : values.unshift(code)
-            event.options[action] = values.flatten.uniq
-          else
-            raise(ArgumentError, "Unknown event: #{event_name.inspect}")
+              action == :before ? values.push(code) : values.unshift(code)
+              event.options[action] = values.flatten.uniq
+            else
+              raise(ArgumentError, "Unknown event: #{event_name.inspect}")
+            end
           end
         end
 

data/lib/rocket_job/server.rb

@@ -271,7 +271,7 @@ module RocketJob
     ensure
       # Logs the backtrace for each running worker
       if SemanticLogger::VERSION.to_i >= 4
-        workers.each { |worker| logger.backtrace(thread: worker.thread) }
+        workers.each { |worker| logger.backtrace(thread: worker.thread) if worker.thread && worker.alive? }
       end
     end
 

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby