sidekiq_remove_scheduled 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d902d2dd737af66bc5d66e1fc06411bf2981021
-  data.tar.gz: 18a5e8a33ce9ed7328e20b4242a585cc8b8ca984
+  metadata.gz: 031d06e38a793a86fbc0b4a761d886b3f5a60fa4
+  data.tar.gz: 31b4bef861a03adf69277d85b4cfb8ccd248dffd
 SHA512:
-  metadata.gz: 9e67b2dae033285fcaf5e73cf7e68ca9f7661a78593674d70e455444c7a1ec262beb95c30c3580e7171a304eacebb46290a75dffa678dad7a383842bb64d9215
-  data.tar.gz: ab15dda909d15bfdb9d6700491ba4a76b95faf876846a1c6fe4bd75564cf7e8810629b72afd20c86ac8d11bf296ae7626bcb6cd6b380cbea8afd10949f811f7b
+  metadata.gz: 90a2024dde2eacca190749ec00c613404b33d14b6c44693c6a4dc456be8129e94e3a9d32ab6dfbb2fa539bff5873ebc3ab40886b4c39c0845440da40aa5fa8fd
+  data.tar.gz: ae24b76b63013f26d8a06fffa4fc132b31f361f2ca5eaa336bc1688ce386b8e86f6269ef4f3e677e9c898990a1c54c6a1ad707448d82b3e6700486650ebff1d0

data/lib/sidekiq_remove_scheduled/binder.rb

@@ -1,17 +1,18 @@
 require 'sidekiq'
 require 'celluloid'
 require 'sidekiq/processor'
-require 'sidekiq_remove_scheduled/job_hook'
-require 'sidekiq_remove_scheduled/process_hook'
+require 'sidekiq_remove_scheduled/logger'
+require 'sidekiq_remove_scheduled/hooks/job_hook'
+require 'sidekiq_remove_scheduled/hooks/process_hook'
 
 module Sidekiq
   module Worker
-    include SidekiqRemoveScheduled::JobHook
+    include SidekiqRemoveScheduled::Hooks::JobHook
   end
 end
 
 module Sidekiq
   class Processor
-    include SidekiqRemoveScheduled::ProcessHook
+    include SidekiqRemoveScheduled::Hooks::ProcessHook
   end
 end

data/lib/sidekiq_remove_scheduled/hooks/job_hook.rb

@@ -0,0 +1,44 @@
+module SidekiqRemoveScheduled
+  module Hooks
+    module JobHook
+      def self.included(base)
+        base.extend ClassMethods
+      end
+      module ClassMethods
+        def self.extended(base)
+          perform_in_hook base
+          remove_scheduled_jobs base
+        end
+        def self.perform_in_hook(base)
+          default_perform_in = base::ClassMethods.instance_method(:perform_in)
+          base::ClassMethods.send :define_method, :perform_in do |interval, *args|
+            jid = default_perform_in.bind(self).call(interval, *args)
+            field = "#{self.to_s}-#{args.to_s}"
+            ::SidekiqRemoveScheduled::Logger.log("Storing job id: #{jid} for field: #{field}")
+            jobs = ::SidekiqRemoveScheduled::Redis.job_queue.get(field).to_s.split(',')
+            jobs << jid
+            ::SidekiqRemoveScheduled::Redis.job_queue.set(field, jobs.uniq.join(','))
+          end
+          base::ClassMethods.send :alias_method, :perform_at, :perform_in
+        end
+        def self.remove_scheduled_jobs(base)
+          base::ClassMethods.send :define_method, :remove_scheduled do |*args|
+            field = "#{self.to_s}-#{args.to_s}"
+            ::SidekiqRemoveScheduled::Logger.log("Removing scheduled jobs for field: #{field}")
+            jobs = ::SidekiqRemoveScheduled::Redis.job_queue.get(field).to_s.split(',')
+            jobs.each do |job_id|
+              pattern = '*,\"jid\":\"'+job_id+'\",*'
+              itterator = 0
+              begin
+                job = ::SidekiqRemoveScheduled::Redis.client.zscan('schedule', itterator, match: pattern)
+                itterator = job.first.to_i
+              end until job.last.present? || itterator == 0
+              ::SidekiqRemoveScheduled::Redis.client.zrem('schedule', job.last.first) if job.last.present?
+            end
+            ::SidekiqRemoveScheduled::Redis.job_queue.del(field)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq_remove_scheduled/hooks/process_hook.rb

@@ -0,0 +1,24 @@
+module SidekiqRemoveScheduled
+  module Hooks
+    module ProcessHook
+      def self.included(base)
+        execute_job_hook base
+      end
+      def self.execute_job_hook(base)
+        default_execute_job = base.instance_method(:execute_job)
+        base.send :define_method, :execute_job do |worker, args|
+          default_execute_job.bind(self).call(worker, args)
+          field = "#{worker.class.to_s}-#{args.to_s}"
+          ::SidekiqRemoveScheduled::Logger.log("Processing and removing job id: #{worker.jid} for field: #{field}")
+          jobs = ::SidekiqRemoveScheduled::Redis.job_queue.get(field).to_s.split(',')
+          jobs.delete(worker.jid)
+          if jobs.blank?
+            ::SidekiqRemoveScheduled::Redis.job_queue.del(field)
+          else
+            ::SidekiqRemoveScheduled::Redis.job_queue.set(field, jobs.join(','))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq_remove_scheduled/logger.rb

@@ -0,0 +1,15 @@
+module SidekiqRemoveScheduled
+  module Logger
+    class << self
+      attr_accessor :logger
+    end
+    def self.set(object)
+      self.logger = object
+      self
+    end
+    def self.log(msg)
+      return if logger.nil?
+      logger.info(msg)
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SidekiqRemoveScheduled
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_remove_scheduled
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rohit Jangid
@@ -63,8 +63,9 @@ files:
 - Rakefile
 - lib/sidekiq_remove_scheduled.rb
 - lib/sidekiq_remove_scheduled/binder.rb
-- lib/sidekiq_remove_scheduled/job_hook.rb
-- lib/sidekiq_remove_scheduled/process_hook.rb
+- lib/sidekiq_remove_scheduled/hooks/job_hook.rb
+- lib/sidekiq_remove_scheduled/hooks/process_hook.rb
+- lib/sidekiq_remove_scheduled/logger.rb
 - lib/sidekiq_remove_scheduled/redis.rb
 - lib/version.rb
 homepage: https://github.com/rohitjangid/sidekiq_remove_scheduled

data/lib/sidekiq_remove_scheduled/job_hook.rb

@@ -1,40 +0,0 @@
-module SidekiqRemoveScheduled
-  module JobHook
-    def self.included(base)
-      base.extend ClassMethods
-    end
-    module ClassMethods
-      def self.extended(base)
-        perform_in_hook base
-        remove_scheduled_jobs base
-      end
-      def self.perform_in_hook(base)
-        default_perform_in = base::ClassMethods.instance_method(:perform_in)
-        base::ClassMethods.send :define_method, :perform_in do |interval, *args|
-          jid = default_perform_in.bind(self).call(interval, *args)
-          field = "#{self.to_s}-#{args.to_s}"
-          jobs = SidekiqRemoveScheduled::Redis.job_queue.get(field).to_s.split(',')
-          jobs << jid
-          SidekiqRemoveScheduled::Redis.job_queue.set(field, jobs.uniq.join(','))
-        end
-        base::ClassMethods.send :alias_method, :perform_at, :perform_in
-      end
-      def self.remove_scheduled_jobs(base)
-        base::ClassMethods.send :define_method, :remove_scheduled do |*args|
-          field = "#{self.to_s}-#{args.to_s}"
-          jobs = SidekiqRemoveScheduled::Redis.job_queue.get(field).to_s.split(',')
-          jobs.each do |job_id|
-            pattern = '*,\"jid\":\"'+job_id+'\",*'
-            itterator = 0
-            begin
-              job = SidekiqRemoveScheduled::Redis.client.zscan('schedule', itterator, match: pattern)
-              itterator = job.first.to_i
-            end until job.last.present? || itterator == 0
-            SidekiqRemoveScheduled::Redis.client.zrem('schedule', job.last.first) if job.last.present?
-          end
-          SidekiqRemoveScheduled::Redis.job_queue.del(field)
-        end
-      end
-    end
-  end
-end

data/lib/sidekiq_remove_scheduled/process_hook.rb

@@ -1,21 +0,0 @@
-module SidekiqRemoveScheduled
-  module ProcessHook
-    def self.included(base)
-      execute_job_hook base
-    end
-    def self.execute_job_hook(base)
-      default_execute_job = base.instance_method(:execute_job)
-      base.send :define_method, :execute_job do |worker, args|
-        default_execute_job.bind(self).call(worker, args)
-        field = "#{worker.class.to_s}-#{args.to_s}"
-        jobs = SidekiqRemoveScheduled::Redis.job_queue.get(field).to_s.split(',')
-        jobs.delete(worker.jid)
-        if jobs.blank?
-          SidekiqRemoveScheduled::Redis.job_queue.del(field)
-        else
-          SidekiqRemoveScheduled::Redis.job_queue.set(field, jobs.join(','))
-        end
-      end
-    end
-  end
-end