rocketjob 5.0.0.beta2 → 5.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e0a831729df45da71a25ce6feb387f3c1040c377db9c56ea9d8626c9300909
-  data.tar.gz: 8ac53b57e6c4e65fb514b66eb2abff96ed43af44a952ce05ba6ffca1c554d33c
+  metadata.gz: 3a9461707111b2196affa91073e002da7664503f5a31aa1718745502e8b677ed
+  data.tar.gz: b1aff5d9bd88c754de93454f699821f5d598767e30830d3456ff289ae0ed7525
 SHA512:
-  metadata.gz: 542f40f8550f666ba4f9ddbaa0cf7739b61efbb2b3cb7d7ddda6ca7526e36202fa218a8e6daec69d57e8ec64af16ab36977b7d97517170075f7246cb203b96d7
-  data.tar.gz: 72c875d097c958eeeaa1a9504b220ec39436c86563c37ca691bcf4fcbccae00dd7db467e6e1eb965e430fcc86b26e278c6c9f584cead41000c8bfdb07b3ebe0e
+  metadata.gz: c61f05e4bd981ce85d199758bc6211256f9fa1408196c9f0168821d79ba8eb4d9e403db2fa91ed5de4a00b20545aadca051bdbd3fd586b9340c6e06430c91f28
+  data.tar.gz: 4ba190a069d7fa2ed7f0a684e1f32e6d7ff6f6a6838df8d082016cecc62d83207522393e6bca0c7a25370a8bfb0986a3f4db51a055a8629df4fa10f8fcac57f6

data/lib/rocket_job/cli.rb

@@ -9,7 +9,8 @@ module RocketJob
   class CLI
     include SemanticLogger::Loggable
     attr_accessor :environment, :pidfile, :directory, :quiet,
-                  :log_level, :log_file, :mongo_config, :symmetric_encryption_config
+                  :log_level, :log_file, :mongo_config, :symmetric_encryption_config,
+                  :max_workers, :include_filter, :exclude_filter, :where_filter
 
     def initialize(argv)
       @quiet                       = false
@@ -32,6 +33,7 @@ module RocketJob
       setup_environment
       setup_logger
       rails? ? boot_rails : boot_standalone
+      override_config
       write_pidfile
 
       # In case Rails did not load the Mongoid Config
@@ -104,6 +106,14 @@ module RocketJob
       self.class.eager_load_jobs
     end
 
+    # Allow the CLI to override the configuration after rails has been loaded.
+    def override_config
+      Config.max_workers    = max_workers if max_workers
+      Config.include_filter = include_filter if include_filter
+      Config.exclude_filter = exclude_filter if exclude_filter
+      Config.where_filter   = where_filter if where_filter
+    end
+
     # Create a PID file if requested
     def write_pidfile
       return unless pidfile
@@ -152,20 +162,20 @@ module RocketJob
           Config.name = arg
         end
         o.on('-w', '--workers COUNT', 'Number of workers (threads) to start') do |arg|
-          Config.max_workers = arg.to_i
+          @max_workers = arg.to_i
         end
         o.on('--include REGEXP', 'Limit this server to only those job classes that match this regular expression (case-insensitive). Example: "DirmonJob|WeeklyReportJob"') do |arg|
-          Config.include_filter = Regexp.new(arg, true)
+          @include_filter = Regexp.new(arg, true)
         end
         o.on('-F', '--filter REGEXP', 'DEPRECATED. Use --include') do |arg|
           warn '-F and --filter are deprecated, use --include'
-          Config.include_filter = Regexp.new(arg, true)
+          @include_filter = Regexp.new(arg, true)
         end
         o.on('-E', '--exclude REGEXP', 'Prevent this server from working on any job classes that match this regular expression (case-insensitive). Example: "DirmonJob|WeeklyReportJob"') do |arg|
-          Config.exclude_filter = Regexp.new(arg, true)
+          @exclude_filter = Regexp.new(arg, true)
         end
         o.on('-W', '--where JSON', "Limit this server instance to the supplied mongo query filter. Supply as a string in JSON format. Example: '{\"priority\":{\"$lte\":25}}'") do |arg|
-          Config.where_filter = JSON.parse(arg)
+          @where_filter = JSON.parse(arg)
         end
         o.on('-q', '--quiet', 'Do not write to stdout, only to logfile. Necessary when running as a daemon') do
           @quiet = true

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = '5.0.0.beta2'.freeze
+  VERSION = '5.0.0.beta3'.freeze
 end

data/lib/rocket_job/worker.rb

@@ -128,7 +128,7 @@ module RocketJob
       return unless (time - @re_check_start) > Config.re_check_seconds
 
       @re_check_start     = time
-      self.current_filter = Config.filter
+      self.current_filter = Config.filter || {}
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta2
+  version: 5.0.0.beta3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm