sidekiq-heartbeat_monitor 1.0.0.2 → 1.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f7be0ca733e03a1e84ed4ccafcb1d0ae8f52c92
-  data.tar.gz: 423742575684aae9713f7bb23e283556f43b3521
+  metadata.gz: f506a3446df89fe6dbb973020355ecd670b04532
+  data.tar.gz: 9efa759217ce9ccaf1a56b97110f8508542c4645
 SHA512:
-  metadata.gz: ec44720762f6c07e9a75432a68ab84c0656a18e86d30bc02cf685af2bb4afad1000ca1f77aecc0af8f65c917535b52d1480c8fc6174510dceb6515b85c5a7462
-  data.tar.gz: 638342ad54f5a29e785fdd4551cd0877767da18a694180faf717ea2d80b1224f2e328b6f465dde1a1932aae639fa495bab80ac34506f085517b4397efb4194ac
+  metadata.gz: 5eb0f1443d34e99930f328cb004a9f1165bf18af47e6df24ba3a3d1752871ad34d0826f9f88f362d138f2d1a230c965312a8a42a0e93b267ca3e2f414f4cc060
+  data.tar.gz: b0858151518b1095a8a3484adebf867cb5876008ea3e286417b1ab344d7dd562724b7f8dd353722861c2338cff6af2bfc3195a205d29852796ee40a81fbc0bb5

data/README.md

@@ -1,4 +1,4 @@
-# Sidekiq Heartbeat Montior Gem
+# Sidekiq Montior Gem
 
 This gem adds 2 things:
 1. A lightweight heartbeat task that runs every few minutes and alerts if it takes longer than a few seconds to start.
@@ -61,15 +61,6 @@ Sidekiq::HeartbeatMonitor.configure(
 
 **Note:** `on_backed_up` and `on_slowed_down` accept an array and will always add to existing callbacks (you can combine `slack_notiifer_url` with them)
 
-### STEP 3. Schedule recurring task
-If you're using sidekiq-cron, add this to your `config/scheduler.yml` file:
-```yml
-sidekiq_heartbeat_monitor:
-  cron: "*/15 * * * * *" # Heart beat runs every 15 seconds in this case
-  class: "Sidekiq::HeartbeatMonitor::Scheduler"
-  queue: scheduler
-```
-
 ## Testing Your Config
 To test your config:
 1. Open your rails console.

data/lib/sidekiq/heartbeat_monitor/config.rb

@@ -18,6 +18,10 @@ module Sidekiq
             @on_backed_up = @on_backed_up.to_a + slack_notifier_callback
             @on_slowed_down = @on_slowed_down.to_a + slack_notifier_callback
           end
+
+          unless Sidekiq::Cron::Job.find("sidekiq_monitor").present?
+            Sidekiq::Cron::Job.create(name: 'sidekiq_monitor', cron: '*/15 * * * * *', class: 'Sidekiq::HeartbeatMonitor::Scheduler')
+          end
         end
 
         def send_test!

data/lib/sidekiq/heartbeat_monitor/scheduler.rb

@@ -10,7 +10,7 @@ module Sidekiq
         Sidekiq::Queue.all.each do |q|
           check_queue_size(q, Sidekiq::HeartbeatMonitor::Config.max_queue_size)
 
-          Sidekiq::HeartbeatMonitor::Worker.perform_async(q.name, 15)
+          Sidekiq::HeartbeatMonitor::Worker.client_push('class' => self, 'args' => [q.name, 15], 'queue' => q.name)
         end
       end
 

data/lib/sidekiq/heartbeat_monitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
     module HeartbeatMonitor
-        VERSION = '1.0.0.2'
+        VERSION = '1.0.1.0'
     end
 end

data/lib/sidekiq/heartbeat_monitor/worker.rb

@@ -10,7 +10,7 @@ module Sidekiq
       # @param queue_name [String] Name of the queue that this heartbeat is running on.
       def perform(queue_name, secs_between_beats = 15)
         current_run_at = Time.now.utc.to_i
-        last_run_at = $redis.get("Sidekiq/HeartbeatMonitor/Worker/#{queue_name}.last_run_at").to_i
+        last_run_at = redis.get("Sidekiq/HeartbeatMonitor/Worker/#{queue_name}.last_run_at").to_i
 
         if last_run_at > 0
           time_since_last_run = current_run_at - last_run_at
@@ -21,7 +21,7 @@ module Sidekiq
           end
         end
 
-        $redis.set("Sidekiq/HeartbeatMonitor/Worker/#{queue_name}.last_run_at", current_run_at, ex: 1.hour)
+        redis.set("Sidekiq/HeartbeatMonitor/Worker/#{queue_name}.last_run_at", current_run_at, ex: 1.hour)
       end
 
       ##
@@ -35,6 +35,11 @@ module Sidekiq
         true
       end
 
+      private
+
+      def redis
+        @@redis = defined?($redis) ? $redis : Redis.new
+      end
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-heartbeat_monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.0.2
+  version: 1.0.1.0
 platform: ruby
 authors:
 - Jay El-Kaake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dont_repeat_for