sensu 0.5.8 → 0.5.9

data/lib/sensu/client.rb

@@ -6,7 +6,7 @@ module Sensu
       EM.run do
         client = self.new(options)
         client.setup_amqp
-        client.setup_keep_alives
+        client.setup_keepalives
         client.setup_subscriptions
 
         Signal.trap('INT') do
@@ -31,7 +31,7 @@ module Sensu
       @result_queue = @amq.queue('results')
     end
 
-    def setup_keep_alives
+    def setup_keepalives
       keepalive_queue = @amq.queue('keepalives')
       keepalive_queue.publish(@settings['client'].merge({'timestamp' => Time.now.to_i}).to_json)
       EM.add_periodic_timer(30) do
@@ -76,6 +76,7 @@ module Sensu
       end
       EM.add_periodic_timer(0.5) do
         unless uniq_queue.subscribed?
+          uniq_queue.unsubscribe
           uniq_queue.subscribe do |check_json|
             check = JSON.parse(check_json)
             execute_check(check)

data/lib/sensu/server.rb

@@ -12,11 +12,11 @@ module Sensu
         server.setup_logging
         server.setup_redis
         server.setup_amqp
-        server.setup_keep_alives
+        server.setup_keepalives
         server.setup_handlers
         server.setup_results
         server.setup_publisher
-        server.setup_keep_alive_monitor
+        server.setup_keepalive_monitor
 
         Signal.trap('INT') do
           EM.stop
@@ -47,10 +47,11 @@ module Sensu
       @amq = MQ.new(connection)
     end
 
-    def setup_keep_alives
+    def setup_keepalives
       keepalive_queue = @amq.queue('keepalives')
       EM.add_periodic_timer(0.5) do
         unless keepalive_queue.subscribed?
+          keepalive_queue.unsubscribe
           keepalive_queue.subscribe do |keepalive_json|
             client = JSON.parse(keepalive_json)['name']
             @redis.set('client:' + client, keepalive_json).callback do
@@ -134,6 +135,7 @@ module Sensu
       result_queue = @amq.queue('results')
       EM.add_periodic_timer(0.5) do
         unless result_queue.subscribed?
+          result_queue.unsubscribe
           result_queue.subscribe do |result_json|
             result = JSON.parse(result_json)
             process_result(result)
@@ -161,7 +163,7 @@ module Sensu
       end
     end
 
-    def setup_keep_alive_monitor
+    def setup_keepalive_monitor
       result_queue = @amq.queue('results')
       EM.add_periodic_timer(30) do
         @redis.smembers('clients').callback do |clients|

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.8"
+  s.version     = "0.5.9"
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"

metadata

@@ -2,7 +2,7 @@
 name: sensu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Sean Porter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp