sidekiq-cron 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccf886f1cd7a1369e8a3dc9a9b9bff96c0742e22e751d9ae61e66f9fa376f873
-  data.tar.gz: 7ad6cd7f4637e0264cdfe529a960891275cd37c03e8bb3eb5e856bfadaa879a1
+  metadata.gz: 7df934577b0740b3e977ffd0e361f6333de6958921659d78bf4c4e4a0015aad9
+  data.tar.gz: 6ae3317c56ff984bf0b651df9117121b4cf67cf36d715eee56a7521f47fe0770
 SHA512:
-  metadata.gz: 90d285a52788e04f6eb253f9f1b215e82a2ab68dc225eb3a4f4f6e2424cfbc190e629a9fa36238b03510cbcc1e2868d9dbf66efd8adbcd68d0aa48a5362e6ba2
-  data.tar.gz: cb48a228304927385f5ea69da2d233fb338efe85875c1e1bd14c3d8b52bf0cf286c307d0c841b04fc98b71453167cb4e932b7f67a15f27faadef580154be4a1f
+  metadata.gz: 8948ce194538c052c1761b921a4df485bc99ab5ce9b2e4c12b576d90e10bb6bb1691d7fe111d8ecc6b54e3324d53b8c5c45c0be561d58c4adb4414f08db576b8
+  data.tar.gz: 2fcccab9c996fe7a6c79c0090875dd81fca30ba6de130af3cf300d1d745e0212e056afe4ea05a8912191703cddf47800f5e3ea6092e1e751091ecf4a3baffc15

data/CHANGELOG.md

@@ -2,10 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.8.0
+
+- Fix deprecation warnings with redis-rb v4.8.0 (https://github.com/ondrejbartas/sidekiq-cron/pull/356)
+- Fix poller affecting Sidekiq scheduled set poller (https://github.com/ondrejbartas/sidekiq-cron/pull/359)
+- Fix default polling interval (https://github.com/ondrejbartas/sidekiq-cron/pull/362)
+- Add italian locale (https://github.com/ondrejbartas/sidekiq-cron/pull/367)
+- Allow disabling of cron polling (https://github.com/ondrejbartas/sidekiq-cron/pull/368)
+
+## 1.7.0
+
+- Enable to use cron notation in natural language (ie `every 30 minutes`) (https://github.com/ondrejbartas/sidekiq-cron/pull/312)
+- Fix `date_as_argument` feature to add timestamp argument at every cron job execution (https://github.com/ondrejbartas/sidekiq-cron/pull/329)
+- Introduce `Sidekiq::Options` to centralize reading/writing options from different Sidekiq versions (https://github.com/ondrejbartas/sidekiq-cron/pull/341)
+- Make auto schedule loading compatible with Array format (https://github.com/ondrejbartas/sidekiq-cron/pull/345)
+
 ## 1.6.0
 
-- Adds support for auto-loading the config/schedule.yml file (https://github.com/ondrejbartas/sidekiq-cron/pull/337)
-- Fix Sidekiq.options deprecation warning (https://github.com/ondrejbartas/sidekiq-cron/pull/338)
+- Adds support for auto-loading the `config/schedule.yml` file (https://github.com/ondrejbartas/sidekiq-cron/pull/337)
+- Fix `Sidekiq.options` deprecation warning (https://github.com/ondrejbartas/sidekiq-cron/pull/338)
 
 ## 1.5.1
 
@@ -30,7 +45,6 @@ All notable changes to this project will be documented in this file.
 
 - Add confirmation dialog when enquing jobs from UI
 - Start to support Sidekiq `average_scheduled_poll_interval` option (replaced `poll_interval`)
-- Enable to use latest fugit to parse cron notation alowing use of natural language (ie `"every 30 minutes"`)
 - Fix deprecation warning for Redis 4.6.x
 - Fix different response from Redis#exists in different Redis versions
 - All PRs:
@@ -52,7 +66,7 @@ All notable changes to this project will be documented in this file.
 
 - Updated readme
 - Fix unit tests - changed argument error when getting invalid cron format
-- When fallbacking old job enqueued time use `Time.parse` without format (so ruby can decide best method to parse it)
+- When fallbacking old job enqueued time use `Time.parse` without format (so Ruby can decide best method to parse it)
 - Add option `date_as_argument` which will add to your job arguments on last place `Time.now.to_f` when it was eneuqued
 - Add option `description` which will allow you to add notes to your jobs so in web view you can see it
 - Fixed translations
@@ -76,8 +90,8 @@ All notable changes to this project will be documented in this file.
 - Fix poller to enqueu all jobs in poll start time
 - Add performance test for enqueue of jobs (10 000 jobs in less than 19s)
 - Fix problem with default queue
-- Remove redis-namespace from dependencies
-- Update ruby versions in travis
+- Remove `redis-namespace` from dependencies
+- Update Ruby versions in Travis
 
 ## 0.5.0
 
@@ -89,7 +103,7 @@ All notable changes to this project will be documented in this file.
 - Add Russian locale
 - User Rack.env in tests
 - Faster enqueue of jobs
-- Permit to use ActiveJob::Base.queue_name_delimiter
+- Permit to use `ActiveJob::Base.queue_name_delimiter`
 - Fix problem with multiple times enqueue #84
 - Fix problem with enqueue of unknown class
 

data/README.md

@@ -64,10 +64,10 @@ gem "sidekiq-cron"
   'queue' => 'name of queue',
   'args' => '[Array or Hash] of arguments which will be passed to perform method',
   'date_as_argument' => true, # add the time of execution as last argument of the perform method
-  'active_job' => true,  # enqueue job through rails 4.2+ active job interface
-  'queue_name_prefix' => 'prefix', # rails 4.2+ active job queue with prefix
-  'queue_name_delimiter' => '.',  # rails 4.2+ active job queue with custom delimiter
-  'description' => 'A sentence describing what work this job performs.'
+  'active_job' => true,  # enqueue job through Rails 4.2+ Active Job interface
+  'queue_name_prefix' => 'prefix', # Rails 4.2+ Active Job queue with prefix
+  'queue_name_delimiter' => '.', # Rails 4.2+ Active Job queue with custom delimiter
+  'description' => 'A sentence describing what work this job performs'
   'status' => 'disabled' # default: enabled
 }
 ```
@@ -83,6 +83,17 @@ If using Rails, this is evaluated against the timezone configured in Rails, othe
 If you want to have your jobs enqueued based on a different time zone you can specify a timezone in the cronline,
 like this `'0 22 * * 1-5 America/Chicago'`.
 
+#### Natural-language formats
+
+Since sidekiq-cron `v1.7.0`, you can use the natural-language formats supported by Fugit, such as:
+
+```rb
+"every day at five" # => '0 5 * * *'
+"every 3 hours"     # => '0 */3 * * *'
+```
+
+See [the relevant part of Fugit documentation](https://github.com/floraison/fugit#fugitnat) for details.
+
 #### Second-precision (sub-minute) cronlines
 
 In addition to the standard 5-parameter cronline format, sidekiq-cron supports scheduling jobs with second-precision using a modified 6-parameter cronline format:
@@ -94,7 +105,7 @@ For example: `"*/30 * * * * *"` would schedule a job to run every 30 seconds.
 Note that if you plan to schedule jobs with second precision you may need to override the default schedule poll interval so it is lower than the interval of your jobs:
 
 ```ruby
-Sidekiq[:average_scheduled_poll_interval] = 10
+Sidekiq[:cron_poll_interval] = 10
 ```
 
 The default value at time of writing is 30 seconds. See [under the hood](#under-the-hood) for more details.
@@ -248,8 +259,6 @@ Sidekiq.configure_server do |config|
 end
 ```
 
-Or you can use for loading jobs from yml file [sidekiq-cron-tasks](https://github.com/coverhound/sidekiq-cron-tasks) which will add rake task `bundle exec rake sidekiq_cron:load` to your rails application.
-
 ### Finding jobs
 
 ```ruby
@@ -312,8 +321,7 @@ add `require 'sidekiq/cron/web'` after `require 'sidekiq/web'`.
 
 With this, you will get:
 
-![Web UI](examples/web-cron-ui.png)
-
+![Web UI](examples/web-cron-ui.jpeg)
 
 ## Under the hood
 
@@ -324,11 +332,13 @@ Sidekiq-Cron adds itself into this start procedure and starts another thread wit
 Sidekiq-Cron is checking jobs to be enqueued every 30s by default, you can change it by setting:
 
 ```ruby
-Sidekiq[:average_scheduled_poll_interval] = 10
+Sidekiq[:cron_poll_interval] = 10
 ```
 
 Sidekiq-Cron is safe to use with multiple Sidekiq processes or nodes. It uses a Redis sorted set to determine that only the first process who asks can enqueue scheduled jobs into the queue.
 
+When running with many Sidekiq processes, the polling can add significant load to Redis. You can disable polling on some processes by setting `Sidekiq[:cron_poll_interval] = 0` on these processes.
+
 ## Contributing
 
 **Thanks to all [contributors](https://github.com/ondrejbartas/sidekiq-cron/graphs/contributors), you’re awesome and this wouldn’t be possible without you!**

data/lib/sidekiq/cron/job.rb

@@ -1,18 +1,21 @@
 require 'fugit'
 require 'sidekiq'
 require 'sidekiq/cron/support'
+require 'sidekiq/options'
 
 module Sidekiq
   module Cron
     class Job
-      #how long we would like to store informations about previous enqueues
+      # How long we would like to store informations about previous enqueues.
       REMEMBER_THRESHOLD = 24 * 60 * 60
+
+      # Time format for enqueued jobs.
       LAST_ENQUEUE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %z'
 
-      # Use the exists? method if we're on a newer version of redis.
+      # Use the exists? method if we're on a newer version of Redis.
       REDIS_EXISTS_METHOD = Gem.loaded_specs['redis'].version < Gem::Version.new('4.2') ? :exists : :exists?
 
-      #crucial part of whole enquing job
+      # Crucial part of whole enqueuing job.
       def should_enque? time
         enqueue = false
         enqueue = Sidekiq.redis do |conn|
@@ -24,18 +27,16 @@ module Sidekiq
         enqueue
       end
 
-      # remove previous informations about run times
-      # this will clear redis and make sure that redis will
-      # not overflow with memory
+      # Remove previous information about run times,
+      # this will clear Redis and make sure that Redis will not overflow with memory.
       def remove_previous_enques time
         Sidekiq.redis do |conn|
           conn.zremrangebyscore(job_enqueued_key, 0, "(#{(time.to_f - REMEMBER_THRESHOLD).to_s}")
         end
       end
 
-      #test if job should be enqued If yes add it to queue
+      # Test if job should be enqueued.
       def test_and_enque_for_time! time
-        #should this job be enqued?
         if should_enque?(time)
           enque!
 
@@ -43,7 +44,7 @@ module Sidekiq
         end
       end
 
-      #enque cron job to queue
+      # Enqueue cron job to queue.
       def enque! time = Time.now.utc
         @last_enqueue_time = time.strftime(LAST_ENQUEUE_TIME_FORMAT)
 
@@ -80,17 +81,27 @@ module Sidekiq
         false
       end
 
+      def date_as_argument?
+        !!@date_as_argument
+      end
+
+      def enqueue_args
+        date_as_argument? ? @args + [Time.now.to_f] : @args
+      end
+
       def enqueue_active_job(klass_const)
-        klass_const.set(queue: @queue).perform_later(*@args)
+        klass_const.set(queue: @queue).perform_later(*enqueue_args)
       end
 
       def enqueue_sidekiq_worker(klass_const)
-        klass_const.set(queue: queue_name_with_prefix).perform_async(*@args)
+        klass_const.set(queue: queue_name_with_prefix).perform_async(*enqueue_args)
       end
 
-      # siodekiq worker message
+      # Sidekiq worker message.
       def sidekiq_worker_message
-        @message.is_a?(String) ? Sidekiq.load_json(@message) : @message
+        message = @message.is_a?(String) ? Sidekiq.load_json(@message) : @message
+        message["args"] = enqueue_args
+        message
       end
 
       def queue_name_with_prefix
@@ -115,8 +126,8 @@ module Sidekiq
         queue_name
       end
 
-      # active job has different structure how it is loading data from sidekiq
-      # queue, it createaswrapper arround job
+      # Active Job has different structure how it is loading data from Sidekiq
+      # queue, it creates a wrapper around job.
       def active_job_message
         {
           'class'        => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
@@ -127,13 +138,13 @@ module Sidekiq
             'job_class'  => @klass,
             'job_id'     => SecureRandom.uuid,
             'queue_name' => @queue_name_with_prefix,
-            'arguments'  => @args
+            'arguments'  => enqueue_args
           }]
         }
       end
 
-      # load cron jobs from Hash
-      # input structure should look like:
+      # Load cron jobs from Hash.
+      # Input structure should look like:
       # {
       #   'name_of_job' => {
       #     'class'       => 'MyClass',
@@ -155,15 +166,15 @@ module Sidekiq
         load_from_array array
       end
 
-      # like to {#load_from_hash}
-      # If exists old jobs in redis but removed from args, destroy old jobs
+      # Like #load_from_hash.
+      # If exists old jobs in Redis but removed from args, destroy old jobs.
       def self.load_from_hash! hash
         destroy_removed_jobs(hash.keys)
         load_from_hash(hash)
       end
 
-      # load cron jobs from Array
-      # input structure should look like:
+      # Load cron jobs from Array.
+      # Input structure should look like:
       # [
       #   {
       #     'name'        => 'name_of_job',
@@ -188,15 +199,15 @@ module Sidekiq
         errors
       end
 
-      # like to {#load_from_array}
-      # If exists old jobs in redis but removed from args, destroy old jobs
+      # Like #load_from_array.
+      # If exists old jobs in Redis but removed from args, destroy old jobs.
       def self.load_from_array! array
         job_names = array.map { |job| job["name"] }
         destroy_removed_jobs(job_names)
         load_from_array(array)
       end
 
-      # get all cron jobs
+      # Get all cron jobs.
       def self.all
         job_hashes = nil
         Sidekiq.redis do |conn|
@@ -208,7 +219,7 @@ module Sidekiq
           end
         end
         job_hashes.compact.reject(&:empty?).collect do |h|
-          # no need to fetch missing args from redis since we just got this hash from there
+          # No need to fetch missing args from Redis since we just got this hash from there
           Sidekiq::Cron::Job.new(h.merge(fetch_missing_args: false))
         end
       end
@@ -222,7 +233,7 @@ module Sidekiq
       end
 
       def self.find name
-        #if name is hash try to get name from it
+        # If name is hash try to get name from it.
         name = name[:name] || name['name'] if name.is_a?(Hash)
 
         output = nil
@@ -234,14 +245,14 @@ module Sidekiq
         output if output && output.valid?
       end
 
-      # create new instance of cron job
+      # Create new instance of cron job.
       def self.create hash
         new(hash).save
       end
 
-      #destroy job by name
+      # Destroy job by name.
       def self.destroy name
-        #if name is hash try to get name from it
+        # If name is hash try to get name from it.
         name = name[:name] || name['name'] if name.is_a?(Hash)
 
         if job = find(name)
@@ -263,23 +274,24 @@ module Sidekiq
         @cron = args["cron"]
         @description = args["description"] if args["description"]
 
-        #get class from klass or class
+        # Get class from klass or class.
         @klass = args["klass"] || args["class"]
 
-        #set status of job
+        # Set status of job.
         @status = args['status'] || status_from_redis
 
-        #set last enqueue time - from args or from existing job
+        # Set last enqueue time - from args or from existing job.
         if args['last_enqueue_time'] && !args['last_enqueue_time'].empty?
           @last_enqueue_time = parse_enqueue_time(args['last_enqueue_time'])
         else
           @last_enqueue_time = last_enqueue_time_from_redis
         end
 
-        #get right arguments for job
+        # Get right arguments for job.
         @symbolize_args = args["symbolize_args"] == true || ("#{args["symbolize_args"]}" =~ (/^(true|t|yes|y|1)$/i)) == 0 || false
         @args = args["args"].nil? ? [] : parse_args( args["args"] )
-        @args += [Time.now.to_f] if args["date_as_argument"]
+
+        @date_as_argument = args["date_as_argument"] == true || ("#{args["date_as_argument"]}" =~ (/^(true|t|yes|y|1)$/i)) == 0 || false
 
         @active_job = args["active_job"] == true || ("#{args["active_job"]}" =~ (/^(true|t|yes|y|1)$/i)) == 0 || false
         @active_job_queue_name_prefix = args["queue_name_prefix"]
@@ -295,8 +307,8 @@ module Sidekiq
             "args"  => @args,
           }
 
-          #get right data for message
-          #only if message wasn't specified before
+          # Get right data for message,
+          # only if message wasn't specified before.
           klass_data = case @klass
             when Class
               @klass.get_sidekiq_options
@@ -304,21 +316,21 @@ module Sidekiq
               begin
                 Sidekiq::Cron::Support.constantize(@klass).get_sidekiq_options
               rescue Exception => e
-                #Unknown class
+                # Unknown class
                 {"queue"=>"default"}
               end
           end
 
           message_data = klass_data.merge(message_data)
-          #override queue if setted in config
-          #only if message is hash - can be string (dumped JSON)
+
+          # Override queue if setted in config,
+          # only if message is hash - can be string (dumped JSON).
           if args['queue']
             @queue = message_data['queue'] = args['queue']
           else
             @queue = message_data['queue'] || "default"
           end
 
-          #dump message as json
           @message = message_data
         end
 
@@ -380,13 +392,12 @@ module Sidekiq
             conn.lrange(jid_history_key, 0, -1) rescue nil
           end
 
-        # returns nil if out nil
         out && out.map do |jid_history_raw|
           Sidekiq.load_json jid_history_raw
         end
       end
 
-      #export job data to hash
+      # Export job data to hash.
       def to_hash
         {
           name: @name,
@@ -394,6 +405,7 @@ module Sidekiq
           cron: @cron,
           description: @description,
           args: @args.is_a?(String) ? @args : Sidekiq.dump_json(@args || []),
+          date_as_argument: @date_as_argument,
           message: @message.is_a?(String) ? @message : Sidekiq.dump_json(@message || {}),
           status: @status,
           active_job: @active_job,
@@ -409,7 +421,7 @@ module Sidekiq
       end
 
       def valid?
-        #clear previous errors
+        # Clear previous errors.
         @errors = []
 
         errors << "'name' must be set" if @name.nil? || @name.size == 0
@@ -417,7 +429,15 @@ module Sidekiq
           errors << "'cron' must be set"
         else
           begin
-            @parsed_cron = Fugit.do_parse_cron(@cron)
+            c = Fugit.do_parse(@cron)
+
+            # Since `Fugit.do_parse` might yield a Fugit::Duration or an EtOrbi::EoTime
+            # https://github.com/floraison/fugit#fugitparses
+            if c.is_a?(Fugit::Cron)
+              @parsed_cron = c
+            else
+              errors << "'cron' -> #{@cron.inspect} -> not a cron but a #{c.class}"
+            end
           rescue => e
             errors << "'cron' -> #{@cron.inspect} -> #{e.class}: #{e.message}"
           end
@@ -438,28 +458,19 @@ module Sidekiq
         end
       end
 
-      # add job to cron jobs
-      # input:
-      #   name: (string) - name of job
-      #   cron: (string: '* * * * *' - cron specification when to run job
-      #   class: (string|class) - which class to perform
-      # optional input:
-      #   queue: (string) - which queue to use for enquing (will override class queue)
-      #   args: (array|hash|nil) - arguments for permorm method
-
       def save
-        #if job is invalid return false
+        # If job is invalid, return false.
         return false unless valid?
 
         Sidekiq.redis do |conn|
 
-          #add to set of all jobs
-          conn.sadd self.class.jobs_key, redis_key
+          # Add to set of all jobs
+          conn.sadd self.class.jobs_key, [redis_key]
 
-          #add informations for this job!
+          # Add informations for this job!
           conn.hmset redis_key, *hash_to_redis(to_hash)
 
-          #add information about last time! - don't enque right after scheduler poller starts!
+          # Add information about last time! - don't enque right after scheduler poller starts!
           time = Time.now.utc
           conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time).to_s) unless conn.public_send(REDIS_EXISTS_METHOD, job_enqueued_key)
         end
@@ -468,7 +479,7 @@ module Sidekiq
 
       def save_last_enqueue_time
         Sidekiq.redis do |conn|
-          # update last enqueue time
+          # Update last enqueue time.
           conn.hset redis_key, 'last_enqueue_time', @last_enqueue_time
         end
       end
@@ -478,37 +489,35 @@ module Sidekiq
           jid: jid,
           enqueued: @last_enqueue_time
         }
-        cron_history_size = Sidekiq.respond_to?(:[]) ? Sidekiq[:cron_history_size] : Sidekiq.options[:cron_history_size]
-        @history_size ||= (cron_history_size || 10).to_i - 1
+
+        @history_size ||= (Sidekiq::Options[:cron_history_size] || 10).to_i - 1
         Sidekiq.redis do |conn|
           conn.lpush jid_history_key,
                      Sidekiq.dump_json(jid_history)
-          # keep only last 10 entries in a fifo manner
+          # Keep only last 10 entries in a fifo manner.
           conn.ltrim jid_history_key, 0, @history_size
         end
       end
 
-      # remove job from cron jobs by name
-      # input:
-      #   first arg: name (string) - name of job (must be same - case sensitive)
       def destroy
         Sidekiq.redis do |conn|
-          #delete from set
-          conn.srem self.class.jobs_key, redis_key
+          # Delete from set.
+          conn.srem self.class.jobs_key, [redis_key]
 
-          #delete runned timestamps
+          # Delete runned timestamps.
           conn.del job_enqueued_key
 
-          # delete jid_history
+          # Delete jid_history.
           conn.del jid_history_key
 
-          #delete main job
+          # Delete main job.
           conn.del redis_key
         end
+
         Sidekiq.logger.info { "Cron Jobs - deleted job with name: #{@name}" }
       end
 
-      # remove all job from cron
+      # Remove all job from cron.
       def self.destroy_all!
         all.each do |job|
           job.destroy
@@ -516,7 +525,7 @@ module Sidekiq
         Sidekiq.logger.info { "Cron Jobs - deleted all jobs" }
       end
 
-      # remove "removed jobs" between current jobs and new jobs
+      # Remove "removed jobs" between current jobs and new jobs
       def self.destroy_removed_jobs new_job_names
         current_job_names = Sidekiq::Cron::Job.all.map(&:name)
         removed_job_names = current_job_names - new_job_names
@@ -557,7 +566,19 @@ module Sidekiq
       private
 
       def parsed_cron
-        @parsed_cron ||= Fugit.parse_cron(@cron)
+        @parsed_cron ||= begin
+                           c = Fugit.parse(@cron)
+
+                           # Since `Fugit.parse` might yield a Fugit::Duration or an EtOrbi::EoTime
+                           # https://github.com/floraison/fugit#fugitparses
+                           if c.is_a?(Fugit::Cron)
+                             c
+                           else
+                             errors << "'cron' -> #{@cron.inspect} -> not a cron but a #{c.class}"
+                           end
+                         rescue => e
+                           errors << "'cron' -> #{@cron.inspect} -> #{e.class}: #{e.message}"
+                         end
       end
 
       def not_enqueued_after?(time)
@@ -565,9 +586,8 @@ module Sidekiq
       end
 
       # Try parsing inbound args into an array.
-      # args from Redis will be encoded JSON;
-      # try to load JSON, then failover
-      # to string array.
+      # Args from Redis will be encoded JSON,
+      # try to load JSON, then failover to string array.
       def parse_args(args)
         case args
         when String
@@ -575,14 +595,14 @@ module Sidekiq
             parsed_args = Sidekiq.load_json(args)
             symbolize_args? ? symbolize_args(parsed_args) : parsed_args
           rescue JSON::ParserError
-            [*args]   # cast to string array
+            [*args]
           end
         when Hash
           symbolize_args? ? [symbolize_args(args)] : [args]
         when Array
           symbolize_args? ? symbolize_args(args) : args
         else
-          [*args]     # cast to string array
+          [*args]
         end
       end
 
@@ -614,29 +634,26 @@ module Sidekiq
 
       def not_past_scheduled_time?(current_time)
         last_cron_time = parsed_cron.previous_time(current_time).utc
-          # or could it be?
-        #last_cron_time = last_time(current_time)
         return false if (current_time.to_i - last_cron_time.to_i) > 60
         true
       end
 
-      # Redis key for set of all cron jobs
+      # Redis key for set of all cron jobs.
       def self.jobs_key
         "cron_jobs"
       end
 
-      # Redis key for storing one cron job
+      # Redis key for storing one cron job.
       def self.redis_key name
         "cron_job:#{name}"
       end
 
-      # Redis key for storing one cron job
+      # Redis key for storing one cron job.
       def redis_key
         self.class.redis_key @name
       end
 
-      # Redis key for storing one cron job run times
-      # (when poller added job to queue)
+      # Redis key for storing one cron job run times (when poller added job to queue)
       def self.job_enqueued_key name
         "cron_job:#{name}:enqueued"
       end
@@ -645,8 +662,6 @@ module Sidekiq
         "cron_job:#{name}:jid_history"
       end
 
-      # Redis key for storing one cron job run times
-      # (when poller added job to queue)
       def job_enqueued_key
         self.class.job_enqueued_key @name
       end
@@ -655,12 +670,10 @@ module Sidekiq
         self.class.jid_history_key @name
       end
 
-      # Give Hash
-      # returns array for using it for redis.hmset
+      # Give Hash returns array for using it for redis.hmset
       def hash_to_redis hash
         hash.inject([]){ |arr,kv| arr + [kv[0], kv[1]] }
       end
-
     end
   end
 end