sensu 0.9.3 → 0.9.4.beta

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.3"
+  VERSION = "0.9.4.beta"
 end

data/lib/sensu/client.rb

@@ -130,7 +130,8 @@ module Sensu
 
     def setup_subscriptions
       @logger.debug('[subscribe] -- setup subscriptions')
-      @check_request_queue = @amq.queue(String.unique, :exclusive => true)
+      @uniq_queue_name ||= rand(36**32).to_s(36)
+      @check_request_queue = @amq.queue(@uniq_queue_name, :auto_delete => true)
       @settings.client.subscriptions.uniq.each do |exchange|
         @logger.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
         @check_request_queue.bind(@amq.fanout(exchange))
@@ -147,10 +148,7 @@ module Sensu
       @timers << EM::PeriodicTimer.new(5) do
         unless @check_request_queue.subscribed?
           @logger.warn('[monitor] -- re-subscribing to subscriptions')
-          @check_request_queue.delete
-          @timers << EM::Timer.new(1) do
-            setup_subscriptions
-          end
+          setup_subscriptions
         end
       end
     end

data/lib/sensu/patches/redis.rb

@@ -19,6 +19,9 @@ module Redis
         until @queue.empty?
           @queue.shift.fail RuntimeError.new 'connection closed'
         end
+        unless @connected
+          raise "could not connect to redis"
+        end
       end
     end
   end

data/lib/sensu/patches/ruby.rb

@@ -45,12 +45,6 @@ class Hash
   end
 end
 
-class String
-  def self.unique(chars=32)
-    rand(36**chars).to_s(36)
-  end
-end
-
 module Process
   def self.write_pid(pid_file)
     if pid_file.nil?

data/sensu.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("em-spec")
   s.add_development_dependency("em-http-request")
-  s.add_development_dependency("rbtrace")
 
   s.files         = Dir.glob("{bin,lib}/**/*") + %w[sensu.gemspec README.org MIT-LICENSE.txt]
   s.executables   = Dir.glob("bin/**/*").map { |file| File.basename(file) }

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: 31098137
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  - beta
+  version: 0.9.4.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 -08:00
+date: 2012-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,20 +212,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rbtrace
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id014
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - sean.porter@sonian.net
@@ -272,12 +259,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: