rocketjob 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e00bccf78b1addfe4e7714526085787e009c852
-  data.tar.gz: bdeb1d7b808c5b589421086254f7f301837d513c
+  metadata.gz: 19ad2006dddc959c04abb5299e6cbdbf8601f54b
+  data.tar.gz: 453df16f28f68ab2ee760d5ebfbaa10241217295
 SHA512:
-  metadata.gz: 0e1a31bdef5185bf7ba414d847d49037871a6b913e3eeda57b98f4a37101b93bd63de8f55c36cfa8ee4cf9fabf55486b01ac4d1ade391104067f45b06a31bb13
-  data.tar.gz: 13289e381b6f879d5da29f0b633316b1b4888dac9c1f5df1bd1048bf91acd122f64ce9837edf5ef631f2f4e8811dde3a008c43bb953557a3560eba2ee25c10d8
+  metadata.gz: bb828a20755d818fbbecd8170de158485634dd032141100510d6758d81bd4641fb3bda747316265786a0528125e5019d06fa724f3eb26ec2de9892cd7b458d93
+  data.tar.gz: cf74c8c0f5878d389b4898414a2fc80e74fbae67cf27419d52c6c61493f5b7a7467e26718c504bbeeedd636d4ff7062dc3aef53816d443a95c30af9d3e287810

data/lib/rocket_job/server.rb

@@ -231,30 +231,7 @@ module RocketJob
       started!
       logger.info 'RocketJob Server started'
 
-      stagger = true
-      while running? || paused?
-        SemanticLogger.silence(:info) do
-          find_and_update(
-            'heartbeat.updated_at' => Time.now,
-            'heartbeat.workers'    => worker_count
-          )
-        end
-        if paused?
-          workers.each(&:shutdown!)
-          stagger = true
-        end
-
-        # In case number of threads has been modified
-        adjust_workers(stagger)
-        stagger = false
-
-        # Stop server if shutdown indicator was set
-        if self.class.shutdown? && may_stop?
-          stop!
-        else
-          sleep Config.instance.heartbeat_seconds
-        end
-      end
+      run_workers
 
       logger.info 'Waiting for workers to stop'
       # Tell each worker to shutdown cleanly
@@ -285,6 +262,33 @@ module RocketJob
       end
     end
 
+    def run_workers
+      stagger = true
+      while running? || paused?
+        SemanticLogger.silence(:info) do
+          find_and_update(
+            'heartbeat.updated_at' => Time.now,
+            'heartbeat.workers'    => worker_count
+          )
+        end
+        if paused?
+          workers.each(&:shutdown!)
+          stagger = true
+        end
+
+        # In case number of threads has been modified
+        adjust_workers(stagger)
+        stagger = false
+
+        # Stop server if shutdown indicator was set
+        if self.class.shutdown? && may_stop?
+          stop!
+        else
+          sleep Config.instance.heartbeat_seconds
+        end
+      end
+    end
+
     # Returns [Fixnum] number of workers (threads) that are alive
     def worker_count
       workers.count(&:alive?)
@@ -319,7 +323,7 @@ module RocketJob
         worker_count = max_workers - count
         logger.info "Starting #{worker_count} workers"
         worker_count.times.each do
-          sleep (Config.instance.max_poll_seconds.to_f / max_workers) * (next_worker_id - 1) if stagger_workers
+          sleep (Config.instance.max_poll_seconds.to_f / max_workers) if stagger_workers
           return if shutdown?
           # Start worker
           begin

data/lib/rocket_job/version.rb

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

data/lib/rocket_job/worker.rb

@@ -32,7 +32,7 @@ module RocketJob
       set_callback(:running, :around, *filters, &blk)
     end
 
-    def initialize(id: 0, server_name: 'inline', inline: false, re_check_seconds: Config.instance.re_check_seconds, filter: nil)
+    def initialize(id: 0, server_name: 'inline:0', inline: false, re_check_seconds: Config.instance.re_check_seconds, filter: nil)
       @id          = id
       @server_name = server_name
       if defined?(Concurrent::JavaAtomicBoolean) || defined?(Concurrent::CAtomicBoolean)
@@ -42,7 +42,7 @@ module RocketJob
       end
       @name             = "#{server_name}:#{id}"
       @thread           = Thread.new { run } unless inline
-      @re_check_seconds = re_check_seconds
+      @re_check_seconds = re_check_seconds || 60
       @re_check_start   = Time.now
       @filter           = filter || {}
       @current_filter   = @filter.dup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: mongo_ha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email:
 - support@rocketjob.io