sidekiq-bus 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060e761bfed32edcda60a412b31777dc734b1305
-  data.tar.gz: 37033fd257e5ca11a6b9a1e8cba60ac783403dee
+  metadata.gz: a863bbad91a600acef85ae8edef094d7b62fef2c
+  data.tar.gz: b190d70f8670247b800141aaa3d7f56860e6f2f4
 SHA512:
-  metadata.gz: 26e2afaa8f446be37c6ad32bb7f7901bb3553f71dfbe4232211812a24fc694ae65252950adae16e36bc2aebec8864fbbed77675281b148c681acae2dcb2e3a29
-  data.tar.gz: a7aba4c5e133877f6ea9bb032e26a852364a7c07c6a4d5fd9ac86026a2f880bbf83a9b05f446f3129ee77a8fa520157243b31e712fbf4f71073a031a694ebb98
+  metadata.gz: a5394ae7f51b10a9bd13b64d28aec02e9199b2f2773314d91330cee471769f51c3680974ae2c9056deeb68185ebc529156343e31089838ed8ea0e9c59d0f9736
+  data.tar.gz: 8c676a81ff6cf08a321712aa2fab208247fc88e453ba3eb576248932588e4cc528fc9d7c7779c60560bde0e972e17c257f277ad3401dad880a888ac97d12db36

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### [0.8.1] - 2019-08-05
+
+### Fixed
+- Schedule is now setup correctly for dyanmic schedules and non-dynamic
+
 ## [0.8.0] - 2019-07-31
 
 ### Added

data/lib/sidekiq_bus/adapter.rb

@@ -47,6 +47,14 @@ module QueueBus
       def setup_heartbeat!(queue_name)
         require 'sidekiq-scheduler'
 
+        ::Sidekiq.configure_server do |config|
+          config.on(:startup) { set_schedule(queue_name) }
+        end
+      end
+
+      private
+
+      def set_schedule(queue_name)
         ::Sidekiq.set_schedule(
           'sidekiqbus_heartbeat',
           every: '1min',
@@ -57,8 +65,8 @@ module QueueBus
           queue: queue_name,
           description: 'Enqueues a heart beat every minute for the queue-bus'
         )
-        # Must reload the schedule to make it present in memory
-        ::Sidekiq.reload_schedule!
+
+        ::Sidekiq::Scheduler.instance.update_schedule unless ::Sidekiq::Scheduler.instance.dynamic
       end
     end
   end

data/lib/sidekiq_bus/version.rb

@@ -1,3 +1,3 @@
 module SidekiqBus
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/adapter_spec.rb

@@ -15,17 +15,32 @@ describe 'adapter is set' do
   end
 
   describe '.setup_heartbeat!' do
-    context 'when already setup' do
-      before { QueueBus.heartbeat! }
+    let(:config) { spy('Sidekiq') }
 
-      it 'does not change schedule' do
-        expect { QueueBus.heartbeat! }
-          .not_to(change { Sidekiq.get_schedule('sidekiqbus_heartbeat') })
+    around do |example|
+      begin
+        old = Sidekiq.options[:lifecycle_events][:startup]
+        Sidekiq.options[:lifecycle_events][:startup] = []
+        example.run
+      ensure
+        Sidekiq.options[:lifecycle_events][:startup] = old
       end
+    end
+
+    before do
+      # This configuration must think it's running on the server.
+      allow(Sidekiq).to receive(:server?).and_return(true)
+
+      # Turn on heartbeats
+      QueueBus.heartbeat!
 
+      # Need to have the schedule loaded before we load anything new
+      Sidekiq::Scheduler.instance.load_schedule!
+    end
+
+    shared_examples 'a scheduled heartbeat' do
       it 'has the schedule for every minute' do
-        expect(Sidekiq.get_schedule('sidekiqbus_heartbeat')['every'])
-          .to eq '1min'
+        expect(Sidekiq.get_schedule('sidekiqbus_heartbeat')['every']).to eq '1min'
       end
 
       it 'has scheduled the queue bus worker' do
@@ -44,11 +59,26 @@ describe 'adapter is set' do
       end
     end
 
-    context 'when it does not exist' do
-      it 'sets the schedule' do
-        expect { QueueBus.heartbeat! }
-          .to(change { Sidekiq.get_schedule('sidekiqbus_heartbeat') })
+    context 'when dynamic' do
+      before do
+        allow(Sidekiq::Scheduler.instance).to receive(:dynamic).and_return(true)
+
+        # Simulate running startup events
+        Sidekiq.options[:lifecycle_events][:startup].each(&:call)
+      end
+
+      it_behaves_like 'a scheduled heartbeat'
+    end
+
+    context 'when non-dynamic' do
+      before do
+        allow(Sidekiq::Scheduler.instance).to receive(:dynamic).and_return(false)
+
+        # Simulate running startup events
+        Sidekiq.options[:lifecycle_events][:startup].each(&:call)
       end
+
+      it_behaves_like 'a scheduled heartbeat'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-bus
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Brian Leonard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue-bus