sensu 0.28.3 → 0.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9121ba275faec01ad227bfe360ecf35f98bb8136
-  data.tar.gz: a9bd2e508a8f271456775a4061ed9ba4e016880c
+  metadata.gz: b6072e3c9acc34e26707916ecb39a15412ac9d6b
+  data.tar.gz: 4684fa7e0c3b7184e3f6e86ff261ab40cee32eb9
 SHA512:
-  metadata.gz: f8493131b507781309e4c769d2e3f9273a1bbe97fc6d5bb82d140b44cd4058ea9edf182ec57c955a0156d3a99cc42ddebfc0089c7e2b20813d9505d062b855f8
-  data.tar.gz: a2aa66bc4afe3abcbbe5f378712bd6854784086d5b79865020f85d58a7a652ef4a1c6fe993fe15011eba43e03d8b8af71d90276311aa1043f810b21bfdd1a306
+  metadata.gz: aecfd752576017e158a8f9e56759ebccdcbf3f11244b361b1dc26e495a7bfea25ceeccdf35f347f7c4472ff50a015c0f62cfcb14a5a532c58de888ac7ac5cde9
+  data.tar.gz: 0759e0044dc2f52816cae0ccd29a19ddf52db86a32b4706ae9dfbc6523f2b6b793a7f5be9f7b8fedb91e5d87e38cbf56076614f109a8126f82ac5804d0fb47f2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.28.4 - 2017-03-10
+
+### Fixes
+
+In the interest of addressing a regression causing duplicate check
+execution requests, code added in 0.28.0 to account for task scheduling
+drift has been removed.
+
 ## 0.28.3 - 2017-03-09
 
 ### Fixes

data/lib/sensu/api/routes/clients.rb

@@ -138,7 +138,7 @@ module Sensu
                         end
                       end
                     else
-                      Timer.new(1) do
+                      EM::Timer.new(1) do
                         delete_client.call(attempts)
                       end
                     end

data/lib/sensu/client/process.rb

@@ -69,7 +69,7 @@ module Sensu
       def setup_keepalives
         @logger.debug("scheduling keepalives")
         publish_keepalive
-        @timers[:run] << PeriodicTimer.new(20) do
+        @timers[:run] << EM::PeriodicTimer.new(20) do
           publish_keepalive
         end
       end
@@ -307,7 +307,7 @@ module Sensu
       # @param check [Hash] definition.
       def schedule_check_cron_execution(check)
         cron_time = determine_check_cron_time(check)
-        @timers[:run] << Timer.new(cron_time) do |timer|
+        @timers[:run] << EM::Timer.new(cron_time) do |timer|
           create_check_execution_proc(check).call
           @timers[:run].delete(timer)
           schedule_check_cron_execution(check)
@@ -336,10 +336,10 @@ module Sensu
       def schedule_check_interval_executions(check)
         execution_splay = testing? ? 0 : calculate_check_execution_splay(check)
         interval = testing? ? 0.5 : check[:interval]
-        @timers[:run] << Timer.new(execution_splay) do
+        @timers[:run] << EM::Timer.new(execution_splay) do
           execute_check = create_check_execution_proc(check)
           execute_check.call
-          @timers[:run] << PeriodicTimer.new(interval, &execute_check)
+          @timers[:run] << EM::PeriodicTimer.new(interval, &execute_check)
         end
       end
 

data/lib/sensu/client/socket.rb

@@ -106,7 +106,7 @@ module Sensu
       # Reset (or start) the connection watchdog.
       def reset_watchdog
         cancel_watchdog
-        @watchdog = Timer.new(WATCHDOG_DELAY) do
+        @watchdog = EM::Timer.new(WATCHDOG_DELAY) do
           @mode = MODE_REJECT
           @logger.warn("discarding data buffer for sender and closing connection", {
             :data => @data_buffer,

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.28.3".freeze
+    VERSION = "0.28.4".freeze
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown].freeze

data/lib/sensu/daemon.rb

@@ -18,7 +18,6 @@ if RUBY_PLATFORM =~ /aix/ || RUBY_PLATFORM =~ /solaris/
   require "em/pure_ruby"
 end
 
-require "sensu/timers"
 require "sensu/json"
 require "sensu/logger"
 require "sensu/settings"
@@ -228,7 +227,7 @@ module Sensu
           @signals << signal
         end
       end
-      PeriodicTimer.new(1) do
+      EM::PeriodicTimer.new(1) do
         signal = @signals.shift
         if STOP_SIGNALS.include?(signal)
           @logger.warn("received signal", :signal => signal)

data/lib/sensu/server/process.rb

@@ -845,7 +845,7 @@ module Sensu
       # @param check [Hash] definition.
       def schedule_check_cron_request(check)
         cron_time = determine_check_cron_time(check)
-        @timers[:leader] << Timer.new(cron_time) do |timer|
+        @timers[:leader] << EM::Timer.new(cron_time) do |timer|
           create_check_request_proc(check).call
           @timers[:leader].delete(timer)
           schedule_check_cron_request(check)
@@ -874,10 +874,10 @@ module Sensu
       def schedule_check_interval_requests(check)
         request_splay = testing? ? 0 : calculate_check_request_splay(check)
         interval = testing? ? 0.5 : check[:interval]
-        @timers[:leader] << Timer.new(request_splay) do
+        @timers[:leader] << EM::Timer.new(request_splay) do
           create_check_request = create_check_request_proc(check)
           create_check_request.call
-          @timers[:leader] << PeriodicTimer.new(interval, &create_check_request)
+          @timers[:leader] << EM::PeriodicTimer.new(interval, &create_check_request)
         end
       end
 
@@ -1037,7 +1037,7 @@ module Sensu
       # stored in the timers hash under `:leader`.
       def setup_client_monitor
         @logger.debug("monitoring client keepalives")
-        @timers[:leader] << PeriodicTimer.new(30) do
+        @timers[:leader] << EM::PeriodicTimer.new(30) do
           determine_stale_clients
         end
       end
@@ -1083,7 +1083,7 @@ module Sensu
       # is stored in the timers hash under `:leader`.
       def setup_check_result_monitor(interval = 30)
         @logger.debug("monitoring check results")
-        @timers[:leader] << PeriodicTimer.new(interval) do
+        @timers[:leader] << EM::PeriodicTimer.new(interval) do
           determine_stale_check_results(interval)
         end
       end
@@ -1214,10 +1214,10 @@ module Sensu
       # every 10 seconds. The timers are stored in the timers hash
       # under `:run`.
       def setup_leader_monitor
-        @timers[:run] << Timer.new(2) do
+        @timers[:run] << EM::Timer.new(2) do
           request_leader_election
         end
-        @timers[:run] << PeriodicTimer.new(10) do
+        @timers[:run] << EM::PeriodicTimer.new(10) do
           if @is_leader
             update_leader_lock
           else
@@ -1267,7 +1267,7 @@ module Sensu
       # timer is stored in the timers hash under `:run`.
       def setup_server_registry_updater
         update_server_registry
-        @timers[:run] << PeriodicTimer.new(10) do
+        @timers[:run] << EM::PeriodicTimer.new(10) do
           update_server_registry
         end
       end

data/lib/sensu/server/socket.rb

@@ -18,7 +18,7 @@ module Sensu
       #
       # @param timeout [Numeric] in seconds.
       def set_timeout(timeout)
-        @timeout_timer = Timer.new(timeout) do
+        @timeout_timer = EM::Timer.new(timeout) do
           @timed_out = true
           close_connection
         end

data/lib/sensu/utilities.rb

@@ -23,7 +23,7 @@ module Sensu
     # @param wait [Numeric] time to delay block calls.
     # @param block [Proc] to call that needs to return true.
     def retry_until_true(wait=0.5, &block)
-      Timer.new(wait) do
+      EM::Timer.new(wait) do
         unless block.call
           retry_until_true(wait, &block)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.28.4
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -275,7 +275,6 @@ files:
 - lib/sensu/server/mutate.rb
 - lib/sensu/server/process.rb
 - lib/sensu/server/socket.rb
-- lib/sensu/timers.rb
 - lib/sensu/utilities.rb
 - sensu.gemspec
 homepage: http://sensuapp.org

data/lib/sensu/timers.rb

@@ -1,26 +0,0 @@
-require "eventmachine"
-
-module Sensu
-  class Timer < EventMachine::Timer; end
-
-  # This fix comes from http://soohwan.blogspot.ca/2011/02/fix-eventmachineperiodictimer.html
-  class PeriodicTimer < EventMachine::PeriodicTimer
-    alias :original_initialize :initialize
-    alias :original_schedule :schedule
-
-    # Record initial start time and the fixed interval, used for
-    # compensating for timer drift when scheduling the next call.
-    def initialize(interval, callback=nil, &block)
-      @start = Time.now
-      @fixed_interval = interval
-      original_initialize(interval, callback, &block)
-    end
-
-    # Calculate the timer drift and compensate for it.
-    def schedule
-      compensation = (Time.now - @start) % @fixed_interval
-      @interval = @fixed_interval - compensation
-      original_schedule
-    end
-  end
-end