sensu 0.7.2-x86-mingw32 → 0.8.0-x86-mingw32

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    sensu (0.7.0)
+    sensu (0.8.0)
       amqp (= 0.7.4)
       async_sinatra
       em-hiredis
       em-syslog
       hashie
       json
+      rack (~> 1.3.4)
       thin
       uuidtools
 
@@ -30,12 +31,12 @@ GEM
       callsite (~> 0.0.5)
       eventmachine
     eventmachine (0.12.10)
-    hashie (1.1.0)
+    hashie (1.2.0)
     hiredis (0.3.2)
     json (1.6.1)
     mime-types (1.16)
-    minitest (2.6.0)
-    rack (1.3.4)
+    minitest (2.7.0)
+    rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rake (0.9.2)
@@ -57,7 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   em-ventually
-  minitest
+  minitest (~> 2.7.0)
   rake
   rest-client
   sensu!

data/Rakefile

@@ -1,10 +1,13 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
 
 task :default => 'test'
 
-Rake::TestTask.new do |test|
-  test.pattern = 'test/*_test.rb'
+desc "Run tests"
+task :test do
+  require File.join(File.dirname(__FILE__), 'test', 'helper')
+  Dir['test/*_test.rb'].each do |test|
+    require File.join(File.dirname(__FILE__), test)
+  end
 end
 
 desc "Build Sensu for Windows"

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/lib/sensu/client.rb

@@ -9,13 +9,15 @@ module Sensu
         client.setup_keepalives
         client.setup_subscriptions
         client.setup_queue_monitor
+        client.setup_socket
 
-        Signal.trap('INT') do
-          EM.stop
-        end
-
-        Signal.trap('TERM') do
-          EM.stop
+        %w[INT TERM].each do |signal|
+          Signal.trap(signal) do
+            EM.warning('[process] -- ' + signal + ' -- stopping sensu client')
+            EM.add_timer(1) do
+              EM.stop
+            end
+          end
         end
       end
     end
@@ -23,24 +25,32 @@ module Sensu
     def initialize(options={})
       config = Sensu::Config.new(:config_file => options[:config_file])
       @settings = config.settings
+      EM.syslog_setup(@settings.syslog.host, @settings.syslog.port)
     end
 
     def setup_amqp
+      EM.debug("[amqp] -- connecting to rabbitmq")
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       @amq = MQ.new(connection)
     end
 
+    def publish_keepalive
+      EM.debug('[keepalive] -- publishing keepalive -- ' + @settings.client.timestamp.to_s)
+      @keepalive_queue ||= @amq.queue('keepalives')
+      @keepalive_queue.publish(@settings.client.to_json)
+    end
+
     def setup_keepalives
-      keepalive_queue = @amq.queue('keepalives')
       @settings.client.timestamp = Time.now.to_i
-      keepalive_queue.publish(@settings.client.to_json)
+      publish_keepalive
       EM.add_periodic_timer(30) do
         @settings.client.timestamp = Time.now.to_i
-        keepalive_queue.publish(@settings.client.to_json)
+        publish_keepalive
       end
     end
 
     def publish_result(check)
+      EM.info('[result] -- publishing check result -- ' + check.name)
       @result_queue ||= @amq.queue('results')
       @result_queue.publish({
         :client => @settings.client.name,
@@ -72,6 +82,7 @@ module Sensu
             end
             EM.defer(execute, publish)
           else
+            EM.warning('[execute] -- missing client attributes -- ' + unmatched_tokens.join(', ') + ' -- ' + check.name)
             check.status = 3
             check.output = 'Missing client attributes: ' + unmatched_tokens.join(', ')
             check.internal = true
@@ -80,6 +91,7 @@ module Sensu
           end
         end
       else
+        EM.warning('[execute] -- unkown check -- ' + check.name)
         check.status = 3
         check.output = 'Unknown check'
         check.internal = true
@@ -91,10 +103,12 @@ module Sensu
     def setup_subscriptions
       @check_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
       @settings.client.subscriptions.each do |exchange|
+        EM.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
         @check_queue.bind(@amq.fanout(exchange))
       end
       @check_queue.subscribe do |check_json|
         check = Hashie::Mash.new(JSON.parse(check_json))
+        EM.info('[subscribe] -- received check -- ' + check.name)
         execute_check(check)
       end
     end
@@ -102,6 +116,7 @@ module Sensu
     def setup_queue_monitor
       EM.add_periodic_timer(5) do
         unless @check_queue.subscribed?
+          EM.warning('[monitor] -- reconnecting to rabbitmq')
           @check_queue.delete
           EM.add_timer(1) do
             setup_subscriptions
@@ -109,5 +124,46 @@ module Sensu
         end
       end
     end
+
+    def setup_socket
+      EM.debug('[socket] -- starting up socket server')
+      EM.start_server('127.0.0.1', 3030, ClientSocket) do |socket|
+        socket.client_name = @settings.client.name
+        socket.result_queue = @amq.queue('results')
+      end
+    end
+  end
+
+  class ClientSocket < EM::Connection
+    attr_accessor :client_name, :result_queue
+
+    def post_init
+      EM.debug('[socket] -- client connected')
+    end
+
+    def receive_data(data)
+      begin
+        check = Hashie::Mash.new(JSON.parse(data))
+        validates = %w[name status output].all? do |key|
+          check.key?(key)
+        end
+        if validates
+          EM.info('[socket] -- publishing check result -- ' + check.name)
+          @result_queue.publish({
+            :client => @client_name,
+            :check => check.to_hash
+          }.to_json)
+        else
+          EM.warning('[socket] -- a check name, exit status, and output are required -- e.g. {name: x, status: 0, output: "y"}')
+        end
+      rescue JSON::ParserError
+        EM.warning('[socket] -- could not parse check result -- expecting JSON')
+      end
+      close_connection
+    end
+
+    def unbind
+      EM.debug('[socket] -- client disconnected')
+    end
   end
 end

data/lib/sensu/config.rb

@@ -48,7 +48,7 @@ module Sensu
           exit
         end
         current_process = $0.split('/').last
-        if current_process == 'sensu-server' || current_process == 'rake_test_loader.rb'
+        if current_process == 'sensu-server' || current_process == 'rake'
           options[:worker] = false
           opts.on('-w', '--worker', 'Only consume jobs, no check publishing (default: false)') do
             options[:worker] = true

data/sensu.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
   s.add_dependency("uuidtools")
   s.add_dependency("em-syslog")
   s.add_dependency("em-hiredis")
+  s.add_dependency("rack", "~> 1.3.4")
   s.add_dependency("async_sinatra")
   s.add_dependency("thin")
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('minitest')
-  s.add_development_dependency('em-ventually')
-  s.add_development_dependency('rest-client')
+  s.add_development_dependency("rake")
+  s.add_development_dependency("minitest", "~> 2.7.0")
+  s.add_development_dependency("em-ventually")
+  s.add_development_dependency("rest-client")
 
   s.files         = `git ls-files`.split("\n").reject {|f| f =~ /(dist|test|png)/}
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: x86-mingw32
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -07:00
+date: 2011-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency