rocketjob 3.0.0.beta → 3.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd04a62d8fb3d214ff56c777828061bf9f0e6453
-  data.tar.gz: 2d86b6a765140aac78ad0083514689c2f1d0ab4f
+  metadata.gz: 8e79fbd2ab361a944bd653f0f8f614aa0cb8f951
+  data.tar.gz: 79b67d6410a552e521dd89964103fef4400c4dee
 SHA512:
-  metadata.gz: de693c53a87019be64dddcde01944eeacf37c0bbc1229130927bb70307a42656c393acc65bc0a0f57045a4b8ba91bd3020ae828a0ab8e980f7bac49215c4b723
-  data.tar.gz: 3f9327e7d49bfac112788b331fb532a55d6bd748f66cbccf43f08d75d1a3412168e2a62182cb354c4648605b349d619a412b41f37231294bd1101328491196b9
+  metadata.gz: 54c2021c45ace9f90b646db94edbe54863f70b9eb6397bc6f8204842422cbc22b287c3d685397a219f53dd462b388d589dd7dbb28af6b2add95894c4cd8029f5
+  data.tar.gz: c5e18971e9c434ea64901dfe377cea4ea92685ef9d1b9c445bc37a3f43830edf15ae42e4edf23bb481576fb9557f420136d1617c48603ef75a962c406ede9986

data/lib/rocket_job/config.rb

@@ -26,7 +26,7 @@ module RocketJob
     #
 
     # The maximum number of workers to create on any one server
-    field :max_worker_threads, type: Integer, default: 10
+    field :max_workers, type: Integer, default: 10
 
     # Number of seconds between heartbeats from a Rocket Job Server process
     field :heartbeat_seconds, type: Integer, default: 15

data/lib/rocket_job/heartbeat.rb

@@ -9,11 +9,8 @@ module RocketJob
     # Time of the last heartbeat received from this server
     field :updated_at, type: Time
 
-    # Number of threads running as at the last heartbeat interval
-    field :active_threads, type: Integer
-    # Number of threads in the pool
-    #   This number should grow and shrink between 1 and :max_workers
-    field :current_threads, type: Integer
+    # Number of workers started.
+    field :workers, type: Integer
 
     #
     # Process Information. Future.

data/lib/rocket_job/performance.rb

@@ -23,7 +23,7 @@ module RocketJob
       RocketJob::Server.running.each do |worker_process|
         unless worker_process.zombie?
           self.worker_processes += 1
-          self.worker_threads   += worker_process.heartbeat.current_threads
+          self.worker_threads   += worker_process.heartbeat.workers
         end
       end
       puts "Running: #{worker_threads} workers, distributed across #{worker_processes} processes"

data/lib/rocket_job/plugins/document.rb

@@ -72,7 +72,7 @@ module RocketJob
         if doc = collection.find(_id: id).find_one_and_update({'$set' => attrs}, return_document: :after)
           # Clear out keys that are not returned during the reload from MongoDB
           (fields.keys + embedded_relations.keys - doc.keys).each { |key| send("#{key}=", nil) }
-          @attributes = attributes
+          @attributes = doc
           apply_defaults
           self
         else

data/lib/rocket_job/plugins/job/model.rb

@@ -150,6 +150,7 @@ module RocketJob
           def queued_now
             queued.or(
               {:run_at.exists => false},
+              {:run_at => nil},
               {:run_at.lte => Time.now}
             )
           end

data/lib/rocket_job/server.rb

@@ -38,7 +38,7 @@ module RocketJob
 
     # The maximum number of workers this server should start
     #   If set, it will override the default value in RocketJob::Config
-    field :max_workers, type: Integer, default: -> { Config.instance.max_worker_threads }
+    field :max_workers, type: Integer, default: -> { Config.instance.max_workers }
 
     # When this server process was started
     field :started_at, type: Time
@@ -223,7 +223,7 @@ module RocketJob
     # Management Thread
     def run
       logger.info "Using MongoDB Database: #{RocketJob::Job.collection.database.name}"
-      build_heartbeat(updated_at: Time.now, current_threads: 0)
+      build_heartbeat(updated_at: Time.now, workers: 0)
       started!
       adjust_workers(true)
       logger.info "RocketJob Server started with #{workers.size} workers running"
@@ -232,8 +232,8 @@ module RocketJob
         sleep Config.instance.heartbeat_seconds
 
         find_and_update(
-          'heartbeat.updated_at'      => Time.now,
-          'heartbeat.current_threads' => worker_count
+          'heartbeat.updated_at' => Time.now,
+          'heartbeat.workers'    => worker_count
         )
 
         # In case number of threads has been modified
@@ -255,8 +255,8 @@ module RocketJob
           # Timeout waiting for worker to stop
           begin
             find_and_update(
-              'heartbeat.updated_at'      => Time.now,
-              'heartbeat.current_threads' => worker_count
+              'heartbeat.updated_at' => Time.now,
+              'heartbeat.workers'    => worker_count
             )
           rescue Mongoid::Errors::DocumentNotFound
             logger.warn('Server has been destroyed. Going down hard!')

data/lib/rocket_job/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.0.0.beta2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby