elected_scheduler 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e36753deee16c6d4ac311880ddf160076f5d60
-  data.tar.gz: 899d8490b59f93ebc242788a303f5084ebe3775a
+  metadata.gz: 65e11fc03001777e3fc15d10cf8f617ccfc7c76e
+  data.tar.gz: b21d8aa9b54dd3858a097e45bacdc2c3333227d7
 SHA512:
-  metadata.gz: 938a658a6c1f60910b09e0f7ca214f8b96b139b15b251593e4bef4ae11919bb352eb29cf1b5d07ec53bcaed9337a163baed2cad4d761ac7b32668cafdee8388d
-  data.tar.gz: 9cf6aace4ec6d692d300f1af6b292a579697fa2fbb4cd22756e2fb4ae67dd17fcd357c8889afbfbdf9f2c2bdd6d8db6a6019e2adce6023d6ee8c29011181f3e0
+  metadata.gz: 0261d2074e5ac4e60f0f2bdc28f719775668eb6c403cb66c2663779c543da6bbc87db6ad646f785375b06052d5bc29f1e2cdc050c227096b1ddeda0a02299730
+  data.tar.gz: b946425a46a34668698a89555ffbe345d79e60a417a6dbb07f2462069d924d233a343ef3d54560a357e4ce5a89f3afdd68c6fb4d36ee469cf43bc63438494e1d

data/README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://travis-ci.org/simple-finance/elected_scheduler.svg?branch=master)](https://travis-ci.org/simple-finance/elected_scheduler)
+[![Code Climate](https://codeclimate.com/github/simple-finance/elected_scheduler/badges/gpa.svg)](https://codeclimate.com/github/simple-finance/elected_scheduler)
+[![security](https://hakiri.io/github/simple-finance/elected_scheduler/master.svg)](https://hakiri.io/github/simple-finance/elected_scheduler/master)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/simple-finance/elected_scheduler?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
 # ElectedScheduler - A ruby distributed cron-like scheduler that only runs jobs on leader processes.
 
 > Schedule your jobs at cron-like times (seconds included) and run the jobs only if the process is the current leader.

data/lib/elected/scheduler/poller.rb

@@ -5,7 +5,7 @@ module Elected
       include Logging
       extend Forwardable
 
-      attr_reader :key, :jobs
+      attr_reader :key, :jobs, :stats
 
       def_delegators :@senado, :timeout
 
@@ -13,6 +13,7 @@ module Elected
         @senado ||= Senado.new key, timeout
         @key    = key
         @jobs   = Concurrent::Hash.new
+        @stats  = Stats.new :processed_job, :no_match, :sleep_slave
       end
 
       def add(job)
@@ -26,27 +27,17 @@ module Elected
         @status ||= :stopped
       end
 
-      def starting?
-        status == :starting
-      end
-
       def running?
         status == :running
       end
 
-      def stopping?
-        status == :stopping
-      end
-
       def stopped?
         status == :stopped
       end
 
       def start
-        unless stopped?
-          debug "cannot start on #{status} ..."
-          return false
-        end
+        return false unless stopped?
+        raise 'No jobs to run!' if jobs.empty?
 
         debug "#{label} starting ..."
         @status = :starting
@@ -54,24 +45,24 @@ module Elected
         @status = :running
         debug "#{label} running poller!"
         @status
-      rescue Exception => e
-        error "#{label} Exception thrown: #{e.class.name} : #{e.message}\n  #{e.backtrace[0, 5].join("\n  ")}"
       end
 
       def stop
-        unless running?
-          warn "cannot stop on #{status} ..."
-          return false
-        end
+        return false unless running?
 
         debug "#{label} stopping poller ..."
         @status = :stopping
         stop_polling_loop
+        senado.release
         @status = :stopped
         debug "#{label} stopped poller!"
         @status
       end
 
+      def leader?
+        senado.leader?
+      end
+
       def to_s
         %{#<#{self.class.name} key="#{key}" timeout="#{timeout}" jobs=#{jobs.size}>}
       end
@@ -85,11 +76,7 @@ module Elected
       def start_polling_loop
         debug 'starting process loop ...'
         @polling_loop_thread = Thread.new do
-          begin
-            poll_and_process_loop
-          rescue Exception => e
-            error "Exception: #{e.class.name} : #{e.message}\n  #{e.backtrace[0, 10].join("\n  ")}"
-          end
+          poll_and_process_loop
         end
       end
 
@@ -97,29 +84,32 @@ module Elected
         cnt = 0
         while running?
           cnt += 1
-          begin
-            debug "#{label(cnt)} calling poll_and_process_jobs while running?:#{running?} ..."
-            poll_and_process_jobs
-          rescue Exception => e
-            error "#{label(cnt)} Exception: #{e.class.name} : #{e.message}\n  #{e.backtrace[0, 5].join("\n  ")}"
-          end
+          debug "#{label(cnt)} calling poll_and_process_jobs while running?:#{running?} ..."
+          poll_and_process_jobs
           sleep_until_next_tick
         end
       end
 
       def poll_and_process_jobs
         if senado.leader?
+          debug "#{label} leader, processing jobs ..."
           start_time = Time.now
           jobs.values.each { |job| process_job job, start_time }
         else
+          debug "#{label} not a leader, sleeping ..."
+          @stats.increment :sleep_slave
           sleep_for_slave
         end
       end
 
       def process_job(job, time)
-        return false unless job.matches? time
+        unless job.matches? time
+          @stats.increment :no_match
+          return false
+        end
 
         Concurrent::Future.execute { job.execute }
+        @stats.increment :processed_job
       end
 
       def stop_polling_loop
@@ -147,8 +137,18 @@ module Elected
 
     extend self
 
+    attr_writer :key, :timeout
+
+    def key
+      @key || 'elected_scheduler_poller'
+    end
+
+    def timeout
+      @timeout || Elected.timeout
+    end
+
     def poller
-      @poller ||= Poller.new
+      @poller ||= Poller.new key, timeout
     end
   end
 end

data/lib/elected/scheduler/schedule.rb

@@ -6,11 +6,14 @@ module Elected
 
       FIELDS = { seconds: :sec, minutes: :min, hours: :hour, days: :day, months: :month, dows: :wday }.freeze
 
-      ABBR_DAYNAMES = %w{ sun mon tue wed thu fri sat }
-      DAYNAMES      = %w{ sunday monday tuesday wednesday thursday friday saturday }
+      ABBR_DAYNAMES = %w{ sun mon tue wed thu fri sat }.freeze
+      DAYNAMES      = %w{ sunday monday tuesday wednesday thursday friday saturday }.freeze
 
-      MONTHNAMES      = %w{ january february march april may june july august september october november december }
-      ABBR_MONTHNAMES = %w{ jan feb mar apr may jun jul aug sep oct nov dec }
+      MONTHNAMES      = %w{ '' january february march april may june july august september october november december }.freeze
+      ABBR_MONTHNAMES = %w{ '' jan feb mar apr may jun jul aug sep oct nov dec }.freeze
+
+      MIN_NUMBERS = { seconds: 0, minutes: 0, hours: 0, days: 1, months: 1, dows: 0 }.freeze
+      MAX_NUMBERS = { seconds: 59, minutes: 59, hours: 23, days: 31, months: 12, dows: 6 }.freeze
 
       def self.defaults
         @defaults ||= { seconds: [0] }
@@ -18,7 +21,7 @@ module Elected
 
       def initialize(options = {})
         @options = options
-        setup *FIELDS.keys
+        setup *(FIELDS.keys)
       end
 
       def matches?(time)
@@ -26,15 +29,7 @@ module Elected
       end
 
       def to_cron_s
-        FIELDS.keys.map do |field|
-          value = get field
-          case value
-            when :all
-              '*'
-            when Range, Array
-              value.map { |x| x.to_s }.join(',')
-          end
-        end.join(' ')
+        FIELDS.keys.map { |field| get_cron_s(field) }.join(' ')
       end
 
       alias :to_s :to_cron_s
@@ -48,6 +43,11 @@ module Elected
 
       alias :[] :get
 
+      def get_cron_s(field)
+        value = get(field)
+        value === :all ? '*' : value.map { |x| x.to_s }.join(',')
+      end
+
       def set(field, value)
         instance_variable_set "@#{field}", convert(field, value)
       end
@@ -65,102 +65,48 @@ module Elected
       end
 
       def convert(field, value)
+        return value if value === :all
+
+        ary = simplify_enum Array(value).flatten
         case field
           when :seconds, :minutes, :hours, :days
-            convert_numbers field, value
+            convert_numbers field, ary
           when :months
-            convert_months value
+            convert_numbers :months, ary, :convert_month_name
           when :dows
-            convert_dows value
+            convert_numbers :dows, ary, :convert_dow_name
         end
       end
 
-      def match?(field, exp_value)
-        value = get field
-        return true if value === :all
-        value.include? exp_value
+      def simplify_enum(ary)
+        ary.map { |x| x.is_a?(Range) ? x.to_a : x }.flatten
       end
 
-      def convert_numbers(field, value)
-        max = { seconds: 60, minutes: 60, hours: 23, days: 31 }[field]
-        case value
-          when :all
-            value
-          when Integer
-            simplify_enum [value], 0, max
-          when Array, Range
-            simplify_enum value, 0, max
-          else
-            raise "Unknown value (#{value.class.name}) #{value.inspect}] for #{field}"
-        end
+      def convert_numbers(field, ary, converter_name = nil)
+        ary.map do |x|
+          converter_name ? send(converter_name, x) : x
+        end.select do |x|
+          x.is_a?(Integer) && x >= MIN_NUMBERS[field] && x <= MAX_NUMBERS[field]
+        end.uniq.sort
       end
 
-      def simplify_enum(ary, min, max)
-        ary.to_a.flatten.map do |x|
-          x.is_a?(Range) ? simplify_enum(x.to_a, min, max) : x.to_i
-        end.flatten.uniq.sort.
-          select { |x| x >= min && x <= max }
-      end
+      def convert_month_name(value)
+        return value unless value.is_a?(String) || value.is_a?(Symbol)
 
-      def convert_months(value)
-        case value
-          when :all
-            value
-          when Integer, Symbol, String
-            convert_months [value]
-          when Array, Range
-            ary = value.map { |x| convert_month x }
-            simplify_enum ary, 1, 12
-          else
-            raise "Unknown value (#{value.class.name}) #{value.inspect}] for month"
-        end
+        [ABBR_MONTHNAMES, MONTHNAMES].map { |ary| ary.index value.to_s.downcase }.compact.first
       end
 
-      def convert_month(value)
-        case value
-          when Integer
-            raise "Unknown value (#{value.class.name}) #{value.inspect}] for month" if value < 1 || value > 12
-            value
-          when Array, Range
-            ary = value.map { |x| convert_month x }
-            simplify_enum ary, 1, 12
-          when String, Symbol
-            idx = [ABBR_MONTHNAMES, MONTHNAMES].map { |ary| ary.index value.to_s.downcase }.compact.first
-            raise "[#{idx}] Unknown value (#{value.class.name}) #{value.inspect}] for month" if idx.nil? || idx < 0 || idx > 11
-            idx + 1
-          else
-            raise "Unknown value (#{value.class.name}) #{value.inspect}] for month"
-        end
-      end
+      def convert_dow_name(value)
+        return value unless value.is_a?(String) || value.is_a?(Symbol)
 
-      def convert_dows(value)
-        case value
-          when :all
-            value
-          when Integer, Symbol, String
-            convert_dows [value]
-          when Array, Range
-            ary = value.map { |x| convert_dow x }
-            simplify_enum ary, 0, 6
-          else
-            raise "Unknown value (#{value.class.name}) #{value.inspect}] for dow"
-        end
+        [ABBR_DAYNAMES, DAYNAMES].map { |ary| ary.index value.to_s.downcase }.compact.first
       end
 
-      def convert_dow(value)
-        case value
-          when Integer
-            value
-          when Array, Range
-            ary = value.map { |x| convert_dow x }
-            simplify_enum ary, 0, 6
-          when String, Symbol
-            idx = [ABBR_DAYNAMES, DAYNAMES].map { |ary| ary.index value.to_s.downcase }.compact.first
-            raise "[#{idx}] Unknown value (#{value.class.name}) #{value.inspect}] for dow" if idx.nil? || idx < 0 || idx > 6
-            idx
-          else
-            raise "Unknown value (#{value.class.name}) #{value.inspect}] for dow"
-        end
+      def match?(field, exp_value)
+        value = get field
+        return true if value === :all
+
+        value.include? exp_value
       end
 
     end

data/lib/elected/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Elected
   module Scheduler
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elected_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Adrian Madrid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elected