sensu 0.15.0.beta → 0.15.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569e92737034cd71fa945830bedb3d7fe66e1905
-  data.tar.gz: 504d8ae1f6068aa9cb735e795c4e2eb12d8d6f40
+  metadata.gz: 88a516bffa471cdc7a92ba7779505d5772d39ac7
+  data.tar.gz: 742e96b264865b62258b2b582982dd260a6a925b
 SHA512:
-  metadata.gz: 2070b2904803138bb6020d31d3044e992319eb76f973ff412f23f31562d862ac185c89ace825e5407bfd2737c0b3d435a07a439e69dd09cd5cc337e5a7e4cee8
-  data.tar.gz: 98e1abd0e4e15e2caf86da808c396522cd08be1724e2a9109ee4c4544baf441f59fac6c7354444ac0e6cedb5e3625b4e3ddae3f2e811a0f98d8593d9d9330eb6
+  metadata.gz: e659c2e552f904b82af92f1e6f18a59fb3e72a77944a5288fb3716708b52921fcf17c686d66593d456346a9692416cfcd5780df4a837328f6bbb929a232617b0
+  data.tar.gz: 8786e10e37c20af6de234f3110f8d96e1fc69ea0909907703ca0465c013dd3f139c576a85b998c1d8d019541e1c335420e5bf395d44b14cae541756663ac9c42

data/lib/sensu/client.rb

@@ -257,8 +257,14 @@ module Sensu
     end
 
     def pause
-      super do
+      unless @state == :pausing || @state == :paused
+        @state = :pausing
+        @timers[:run].each do |timer|
+          timer.cancel
+        end
+        @timers[:run].clear
         @transport.unsubscribe
+        @state = :paused
       end
     end
 

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.15.0.beta'
+    VERSION = '0.15.0.beta.1'
 
     SEVERITIES = %w[ok warning critical unknown]
 

data/lib/sensu/daemon.rb

@@ -90,18 +90,8 @@ module Sensu
       @state = :running
     end
 
-    def pause(&block)
-      unless @state == :pausing || @state == :paused
-        @state = :pausing
-        @timers[:run].each do |timer|
-          timer.cancel
-        end
-        @timers[:run].clear
-        if block
-          block.call
-        end
-        @state = :paused
-      end
+    def pause
+      @state = :paused
     end
 
     def resume

data/lib/sensu/server.rb

@@ -728,9 +728,15 @@ module Sensu
     end
 
     def pause
-      super do
+      unless @state == :pausing || @state == :paused
+        @state = :pausing
+        @timers[:run].each do |timer|
+          timer.cancel
+        end
+        @timers[:run].clear
         unsubscribe
         resign_as_master
+        @state = :paused
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta
+  version: 0.15.0.beta.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -289,4 +289,3 @@ signing_key:
 specification_version: 4
 summary: A monitoring framework
 test_files: []
-has_rdoc: false