sidekiq_bulk_job 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71203ea369c49030deec6cf4e48363f00c9308a8840832717c575f4621251ab4
-  data.tar.gz: c41f6dd123ca271c2224ed21151c6401c03cafd40e1b9a6d187fec22190884bc
+  metadata.gz: 795d7a4f3d359d67ee4cf6894df0fc14193da298e778e779da208f38168f6a96
+  data.tar.gz: baf26c1a2d731da06faed59c9824298e4c22c7ae3cf8a67e4fb7c29fa2d4860e
 SHA512:
-  metadata.gz: 4ee561021c0fe02bfd932f3e9d2a1a3db86b4445fe4ac16c4be5073122d813fc1937b81d4e15e7094362663f8b34a2ef75338f37c5ffdeba99262aea38919034
-  data.tar.gz: 0fcdfb2dd97e3f22a946178c8c4db149d54e978a590606a5a472e32bd9b25e66839e4e9709c592e96f86fa0200a4c94de7288c24de6d77c26db5e89359d8c7ce
+  metadata.gz: ac4f23ee0e7a81ad91ee343c3c5df63baf656d48a3eebe2925f18cd6e87589f519c477f3f2c49c4cf0fa923586506591ee81014fce20a8ff848ab63a8df0b195
+  data.tar.gz: b770c30598a61234cbcd1534c84ed9f7f0782b47f3315c51e1aa2368b2a82eabdcc1cdbc8b062bbce491e7b726ef662e74448dd6474abd9a89be5c9d6ad7cace

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq_bulk_job (0.1.3)
+    sidekiq_bulk_job (0.1.4)
       sidekiq (~> 5.2.7)
 
 GEM

data/lib/sidekiq_bulk_job.rb

@@ -64,18 +64,37 @@ module SidekiqBulkJob
 
   class << self
 
-    attr_accessor :prefix, :redis, :queue, :batch_size, :logger, :process_fail
+    attr_accessor :prefix, :redis, :queue, :scheduled_delay, :async_delay, :batch_size, :logger, :process_fail
 
-    def config(redis: , logger: , process_fail: , queue: :default, batch_size: 3000, prefix: "SidekiqBulkJob")
+    def config(redis: , logger: , process_fail: , async_delay: 60, scheduled_delay: 10, queue: :default, batch_size: 3000, prefix: "SidekiqBulkJob")
       if redis.nil?
         raise ArgumentError.new("redis not allow nil")
       end
+      if logger.nil?
+        raise ArgumentError.new("logger not allow nil")
+      end
+      if process_fail.nil?
+        raise ArgumentError.new("process_fail not allow nil")
+      end
+      if async_delay.to_f < 2
+        raise ArgumentError.new("async_delay not allow less than 2 seconds.")
+      elsif async_delay.to_f > 5 * 60
+        raise ArgumentError.new("async_delay not allow greater than 5 minutes.")
+      end
+      if scheduled_delay.to_f < 2
+        raise ArgumentError.new("scheduled_delay not allow less than 2 seconds.")
+      elsif scheduled_delay.to_f > 30
+        raise ArgumentError.new("scheduled_delay not allow greater than 2 seconds.")
+      end
+
       self.redis = redis
       self.queue = queue
       self.batch_size = batch_size
       self.prefix = prefix
       self.logger = logger
       self.process_fail = process_fail
+      self.async_delay = async_delay.to_f
+      self.scheduled_delay = scheduled_delay.to_f
     end
 
     def set(options)
@@ -121,7 +140,7 @@ module SidekiqBulkJob
         args_redis_key = nil
         target = scheduled_set.find do |job|
           if job.klass == SidekiqBulkJob::ScheduledJob.to_s &&
-                job.at.to_i.between?((at - 5).to_i, (at + 30).to_i) # 允许30秒延迟
+                job.at.to_i.between?((at - self.scheduled_delay).to_i, (at + self.scheduled_delay).to_i) # 允许30秒延迟
               _job_class_name, args_redis_key = job.args
               _job_class_name == job_class_name
            end
@@ -197,7 +216,7 @@ module SidekiqBulkJob
       if !_monitor.nil?
         # TODO debug log
       else
-        SidekiqBulkJob::Monitor.client_push("queue" => queue, "at" => (time_now + 60).to_f, "class" => SidekiqBulkJob::Monitor, "args" => [time_now.to_f, job_class_name])
+        SidekiqBulkJob::Monitor.client_push("queue" => queue, "at" => (time_now + self.async_delay).to_f, "class" => SidekiqBulkJob::Monitor, "args" => [time_now.to_f, job_class_name])
       end
     end
 

data/lib/sidekiq_bulk_job/version.rb

@@ -1,3 +1,3 @@
 module SidekiqBulkJob
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_bulk_job
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - scalaview