sensu 0.15.0.beta → 0.15.0.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 569e92737034cd71fa945830bedb3d7fe66e1905
4
- data.tar.gz: 504d8ae1f6068aa9cb735e795c4e2eb12d8d6f40
3
+ metadata.gz: 88a516bffa471cdc7a92ba7779505d5772d39ac7
4
+ data.tar.gz: 742e96b264865b62258b2b582982dd260a6a925b
5
5
  SHA512:
6
- metadata.gz: 2070b2904803138bb6020d31d3044e992319eb76f973ff412f23f31562d862ac185c89ace825e5407bfd2737c0b3d435a07a439e69dd09cd5cc337e5a7e4cee8
7
- data.tar.gz: 98e1abd0e4e15e2caf86da808c396522cd08be1724e2a9109ee4c4544baf441f59fac6c7354444ac0e6cedb5e3625b4e3ddae3f2e811a0f98d8593d9d9330eb6
6
+ metadata.gz: e659c2e552f904b82af92f1e6f18a59fb3e72a77944a5288fb3716708b52921fcf17c686d66593d456346a9692416cfcd5780df4a837328f6bbb929a232617b0
7
+ data.tar.gz: 8786e10e37c20af6de234f3110f8d96e1fc69ea0909907703ca0465c013dd3f139c576a85b998c1d8d019541e1c335420e5bf395d44b14cae541756663ac9c42
data/lib/sensu/client.rb CHANGED
@@ -257,8 +257,14 @@ module Sensu
257
257
  end
258
258
 
259
259
  def pause
260
- super do
260
+ unless @state == :pausing || @state == :paused
261
+ @state = :pausing
262
+ @timers[:run].each do |timer|
263
+ timer.cancel
264
+ end
265
+ @timers[:run].clear
261
266
  @transport.unsubscribe
267
+ @state = :paused
262
268
  end
263
269
  end
264
270
 
@@ -1,6 +1,6 @@
1
1
  module Sensu
2
2
  unless defined?(Sensu::VERSION)
3
- VERSION = '0.15.0.beta'
3
+ VERSION = '0.15.0.beta.1'
4
4
 
5
5
  SEVERITIES = %w[ok warning critical unknown]
6
6
 
data/lib/sensu/daemon.rb CHANGED
@@ -90,18 +90,8 @@ module Sensu
90
90
  @state = :running
91
91
  end
92
92
 
93
- def pause(&block)
94
- unless @state == :pausing || @state == :paused
95
- @state = :pausing
96
- @timers[:run].each do |timer|
97
- timer.cancel
98
- end
99
- @timers[:run].clear
100
- if block
101
- block.call
102
- end
103
- @state = :paused
104
- end
93
+ def pause
94
+ @state = :paused
105
95
  end
106
96
 
107
97
  def resume
data/lib/sensu/server.rb CHANGED
@@ -728,9 +728,15 @@ module Sensu
728
728
  end
729
729
 
730
730
  def pause
731
- super do
731
+ unless @state == :pausing || @state == :paused
732
+ @state = :pausing
733
+ @timers[:run].each do |timer|
734
+ timer.cancel
735
+ end
736
+ @timers[:run].clear
732
737
  unsubscribe
733
738
  resign_as_master
739
+ @state = :paused
734
740
  end
735
741
  end
736
742
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.0.beta
4
+ version: 0.15.0.beta.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Porter
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-10-23 00:00:00.000000000 Z
12
+ date: 2014-10-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: multi_json
@@ -289,4 +289,3 @@ signing_key:
289
289
  specification_version: 4
290
290
  summary: A monitoring framework
291
291
  test_files: []
292
- has_rdoc: false