sidekiq-cronitor 1.0.0.alpha → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9be623c484eb06cd00eb0c7687351252266e2f5
-  data.tar.gz: 473caa08118deaae2c4ff3985fdfe31fb59ad2f8
+  metadata.gz: d7a312993ccafb8425bb94bfff6deec07241ff5e
+  data.tar.gz: 96bba8e59b67eafaf8dda5e42a2b5c4804e41344
 SHA512:
-  metadata.gz: 66712be66af8fab84b8a41763f806bc411278841a984996e91e23cd841fdb2adcc2f49841ec1dc4417dfc9a9edffa602304fbbfdc04ffa27407c53b51cc8d714
-  data.tar.gz: c3f8671045720143dc77b8e686bafe12a5af8705969319a5f3181b3c8ab09f500c9883ec935ed13ce812ca19f579efce71bca028277b858308c3aadf8de3840e
+  metadata.gz: 65f500c417e836ee253b45c156dcf4fe39ab6e9103d892378e7a0bce8c74f5d1811d0b9359d3a1d953dc8ee32204ae0902a93c2f101c671f690d34e678379253
+  data.tar.gz: 59b58af7800b9a659b0b59f57c3972b50cfcd64459c2975c75728aa745b405a69fbf6f5fe92f1b02041752b1eaf6cc3010b0a5ec8b1f7d6880139404c4aa8b89

data/lib/sidekiq/cronitor.rb

@@ -48,18 +48,21 @@ module Sidekiq::Cronitor
       # Default monitor name to sidekiq worker (class) name
       kwargs[:opts][:name] ||= name
 
-      # If we're using Sidekiq::Cron and there's a job for this class then use
-      # it's cron schedule for a default not_on_schedudle rule, and tag this as
-      # a cron job
-      if defined?(Sidekiq::Cron) && job = Sidekiq::Cron::Job.all.find { |j| j.klass == name }
-        kwargs[:opts][:rules] ||= [{rule_type: "not_on_schedule", value: job.cron}]
-        kwargs[:opts][:tags] ||= ["cron-job", "sidekiq-cron", "sidekiq-cronitor"]
-      end
-
       # Some hints about where this monitor came from
-      kwargs[:opts][:tags] ||= ["sidekiq-cronitor"]
+      kwargs[:opts][:tags] ||= []
+      kwargs[:opts][:tags] << "sidekiq-cronitor"
+      if environment = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || Sidekiq.options[:environment]
+        kwargs[:opts][:tags] << environment
+      end
       kwargs[:opts][:note] ||= "Created by sidekiq-cronitor"
 
+      # If we can find a schedule for this worker then we can automatically add
+      # a not_on_schedule rule and tag it as a cron-job
+      if schedule = cronitor_schedule
+        kwargs[:opts][:rules] ||= [{rule_type: "not_on_schedule", value: schedule}]
+        kwargs[:opts][:tags] << "cron-job"
+      end
+
       begin
         @cronitor = Cronitor.new(**kwargs)
       rescue Cronitor::Error => e
@@ -68,6 +71,31 @@ module Sidekiq::Cronitor
         @cronitor = nil
       end
     end
+
+    private def cronitor_schedule
+      name = self.name
+
+      if defined?(Sidekiq::Cron)
+        # If we can find a Sidekiq::Cron job with a matching worker class
+        # then presume its schedule.
+        Sidekiq::Cron::Job.all.each do |job|
+          if job.klass == name
+            return job.cron
+          end
+        end
+      elsif defined?(Sidekiq::Periodic)
+        # If we can find a Sidekiq Enterprise Periodic Loop with a matching
+        # worker class then presume its schedule.
+        Sidekiq::Periodic::LoopSet.new.each do |loop_|
+          if loop_.klass == name
+            return loop_.schedule
+          end
+        end
+      end
+
+      # ¯\_(ツ)_/¯
+      return nil
+    end
   end
 
   class Middleware

data/lib/sidekiq/cronitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Cronitor
-    VERSION = "1.0.0.alpha"
+    VERSION = "1.0.0.alpha2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cronitor
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Samuel Cochran
@@ -28,7 +28,7 @@ cert_chain:
   P4lSfmXxsd1C71ckIp0cyXkPhyTtpyS/5hq9HhuUNzEHkSDe36/Rd1xYKV5JxMC2
   YAttWFUs06lor2q1wwncPaMtUtbWwW35+1IV6xhs2rFY6DD/I6ZkK3GnHdY=
   -----END CERTIFICATE-----
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq