rocketjob 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 305189df5d57cf64c3d771bc05f940df6be6fd8c322ae9f3f796166fe99e1b75
-  data.tar.gz: a16ed0d77f1d1cb4e0ec4beefba922278a8b05e90ab5ecaffe6a3c347abdfed0
+  metadata.gz: 10ef66caa28110774987fdeff06af1a4906ed724bc307bf55d012e1104a9eca8
+  data.tar.gz: b0384cccd5d694a3431c6c9cb7d004603c4b79865929b8c2bb249b4b66e937a2
 SHA512:
-  metadata.gz: f2afe61652e3b6b225515b95e7b370f8c4a8853c30cad45d0fc93d49a86571764b480aaca5a5cfb264ea1ea86912b6b680e4e122952383f2425585e3683e8581
-  data.tar.gz: eb1b041fbe425143c5f2b64aa5e799c35bf6885c00020964cf87d87485ba359e19796f7e5c5378baefe9f4ca93fe5de900b78e6669c7ffe83838c87e197ab0e1
+  metadata.gz: 331a1c21ad9c2b481e67d5d3857e3158dd23a7bb6524dd872773e0aad0e0c5edb4e02d4a60be6498bc212e2517c81c027ce7f22d6b378e9d5772c391669c4347
+  data.tar.gz: e46cdffa443cc75d5dbed5f396ec84fb19fd12bad5b48bbddad7d310526a941bd837f778da8391460e40c575caed62c6e0329adc99ae8c58b07ada694cb1684c

data/lib/rocket_job/batch/categories.rb

@@ -75,27 +75,26 @@ module RocketJob
         return category_name if category_name.is_a?(Category::Input)
         raise(ArgumentError, "Cannot supply Output Category to input category") if category_name.is_a?(Category::Output)
 
+        # Initialize categories when this method is called before initialization is complete
+        rocketjob_categories_assign if input_categories.empty?
+
         category_name = category_name.to_sym
         # find does not work against this association
         input_categories.each { |category| return category if category.name == category_name }
 
-        unless category_name == :main
-          raise(
-            ArgumentError,
-            "Unknown Input Category: #{category_name.inspect}. Registered categories: #{input_categories.collect(&:name).join(',')}"
-          )
-        end
-
-        # Auto-register main input category when not defined
-        category = Category::Input.new(job: self)
-        self.input_categories << category
-        category
+        raise(
+          ArgumentError,
+          "Unknown Input Category: #{category_name.inspect}. Registered categories: #{input_categories.collect(&:name).join(',')}"
+        )
       end
 
       def output_category(category_name = :main)
         return category_name if category_name.is_a?(Category::Output)
         raise(ArgumentError, "Cannot supply Input Category to output category") if category_name.is_a?(Category::Input)
 
+        # Initialize categories when this method is called before initialization is complete
+        rocketjob_categories_assign if output_categories.empty? && self.class.defined_output_categories
+
         category_name = category_name.to_sym
         # .find does not work against this association
         output_categories.each { |category| return category if category.name == category_name }
@@ -154,7 +153,7 @@ module RocketJob
             end
         end
 
-        return if !self.class.defined_output_categories || !output_categories.empty?
+        return if !output_categories.empty? || !self.class.defined_output_categories
 
         # Input categories defaults to nil if none was set in the class
         self.output_categories = self.class.defined_output_categories.deep_dup
@@ -164,7 +163,6 @@ module RocketJob
       def rocketjob_categories_output_render
         return if @rocket_job_output.nil?
 
-        # TODO: ..
         return unless output_categories
         return if output_categories.empty?
 

data/lib/rocket_job/subscribers/secret_config.rb

@@ -0,0 +1,17 @@
+module RocketJob
+  module Subscribers
+    # Cause all instances to refresh their in-memory copy
+    # of the Secret Config Registry
+    #
+    #   RocketJob::Subscribers::SecretConfig.publish(:refresh)
+    class SecretConfig
+      include RocketJob::Subscriber
+
+      def refresh
+        logger.measure_info "Refreshed Secret Config" do
+          ::SecretConfig.refresh!
+        end
+      end
+    end
+  end
+end

data/lib/rocket_job/supervisor.rb

@@ -14,6 +14,7 @@ module RocketJob
       Thread.current.name = "rocketjob main"
       RocketJob.create_indexes
       register_signal_handlers
+      subscribe_to_events
 
       server = Server.create!
       new(server).run
@@ -34,14 +35,8 @@ module RocketJob
       logger.info "Rocket Job Server started"
 
       event_listener = Thread.new { Event.listener }
-      Subscribers::Server.subscribe(self) do
-        Subscribers::Worker.subscribe(self) do
-          Subscribers::Logger.subscribe do
-            supervise_pool
-            stop!
-          end
-        end
-      end
+      supervise_pool
+      stop!
     rescue ::Mongoid::Errors::DocumentNotFound
       logger.info("Server has been destroyed. Going down hard!")
     rescue Exception => e
@@ -94,5 +89,12 @@ module RocketJob
     def synchronize(&block)
       @mutex.synchronize(&block)
     end
+
+    def subscribe_to_events
+      Subscribers::Logger.subscribe
+      Subscribers::SecretConfig.subscribe if defined?(SecretConfig)
+      Subscribers::Server.subscribe
+      Subscribers::Worker.subscribe
+    end
   end
 end

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = "6.0.1".freeze
+  VERSION = "6.0.2".freeze
 end

data/lib/rocketjob.rb

@@ -83,12 +83,13 @@ module RocketJob
     autoload :UploadFileJob,         "rocket_job/jobs/upload_file_job"
 
     module ReEncrypt
-      autoload :RelationalJob, "rocket_job/jobs/re_encrypt/relational_job"
+      autoload :RelationalJob,       "rocket_job/jobs/re_encrypt/relational_job"
     end
   end
 
   module Subscribers
     autoload :Logger,                "rocket_job/subscribers/logger"
+    autoload :SecretConfig,          "rocket_job/subscribers/secret_config"
     autoload :Server,                "rocket_job/subscribers/server"
     autoload :Worker,                "rocket_job/subscribers/worker"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -205,6 +205,7 @@ files:
 - lib/rocket_job/sliced/writer/output.rb
 - lib/rocket_job/subscriber.rb
 - lib/rocket_job/subscribers/logger.rb
+- lib/rocket_job/subscribers/secret_config.rb
 - lib/rocket_job/subscribers/server.rb
 - lib/rocket_job/subscribers/worker.rb
 - lib/rocket_job/supervisor.rb