rocketjob 5.3.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42be7df83c1d38b5ef3a41751e3cc6afd6fb885638a7d144bfd1f71ff5de441e
-  data.tar.gz: fd3942b7fe1aa2d76bda3395561bea56122b9eab58c0ae65d99fbea76e3d771c
+  metadata.gz: 9fc6fef03f96de2e2645a4419a4f4f0cdf409da64a7bb708bcddb24ae0fc6c4f
+  data.tar.gz: 4c8573924fae294676afc2114a83b522c64a3b259e679a2a343fc4b34f7bab8f
 SHA512:
-  metadata.gz: 324641130fd1bb0724058d81cdf33dad02bbdeef2047413a479dcb0bb0782be37be3e0aad9b5c57d9ea200e6cc30889ce06ce8130716f91399472bf317ed4089
-  data.tar.gz: dfe9e7f121e7fee9c4713d5fc819e3889d1e0d1d208ac14cd4678f83ce0f802f51e2067cd10d687301a9f7470a609eab6259036e191ae8e6198f7a7830cbbd82
+  metadata.gz: e21ca8c550d28e77d48a6b47b3f7e0c822350e72ba557e56749277f8a2536cd669f63b86b20c39bc264b8619196f40a2aa38940cb04aedaad1a1a07daa36b666
+  data.tar.gz: cd3202dd8ecf093ba591385aab9529f8f8f2d1bf7f286252db9ab7589f49c86293d96f3e72bd5ba85eed6b344eb92f35414cc3c32ee327dcf00f722b4929d2a4

data/lib/rocket_job/plugins/cron.rb

@@ -45,20 +45,10 @@ module RocketJob
         end
       end
 
-      # Returns [Time] the next time this job will be scheduled to run at.
-      #
-      # Parameters
-      #   time: [Time]
-      #     The next time as of this time.
-      #     Default: Time.now
-      def rocket_job_cron_next_time(time = Time.now)
-        Fugit::Cron.new(cron_schedule).next_time.to_utc_time
-      end
-
       def rocket_job_cron_set_run_at
-        return unless cron_schedule
+        return if cron_schedule.nil? || !(cron_schedule_changed? && !run_at_changed?)
 
-        self.run_at = rocket_job_cron_next_time if cron_schedule_changed? && !run_at_changed?
+        self.run_at = Fugit::Cron.new(cron_schedule).next_time.to_utc_time
       end
     end
   end

data/lib/rocket_job/subscribers/server.rb

@@ -9,16 +9,22 @@ module RocketJob
         @supervisor = supervisor
       end
 
-      def kill(server_id: nil, name: nil, wait_timeout: 3)
+      def kill(server_id: nil, name: nil, wait_timeout: 5)
         return unless my_server?(server_id, name)
 
         supervisor.synchronize do
+          Supervisor.shutdown!
+
+          supervisor.logger.info("Stopping Pool")
           supervisor.worker_pool.stop
-          supervisor.worker_pool.join(wait_timeout)
+          unless supervisor.worker_pool.living_count == 0
+            supervisor.logger.info("Giving pool #{wait_timeout} seconds to terminate")
+            sleep(wait_timeout)
+          end
+          supervisor.logger.info("Kill Pool")
           supervisor.worker_pool.kill
         end
 
-        Supervisor.shutdown!
         logger.info "Killed"
       end
 

data/lib/rocket_job/supervisor.rb

@@ -55,7 +55,9 @@ module RocketJob
 
     def stop!
       server.stop! if server.may_stop?
-      worker_pool.stop
+      synchronize do
+        worker_pool.stop
+      end
       until worker_pool.join
         logger.info "Waiting for workers to finish processing ..."
         # One or more workers still running so update heartbeat so that server reports "alive".

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = "5.3.1".freeze
+  VERSION = "5.3.2".freeze
 end

data/lib/rocket_job/worker_pool.rb

@@ -61,6 +61,7 @@ module RocketJob
     # Kill Worker threads
     def kill
       workers.each(&:kill)
+      workers.clear
     end
 
     # Wait for all workers to stop.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby's missing batch processing system.