sensu 0.5.13 → 0.5.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sensu (0.5.12)
+    sensu (0.5.13)
       amqp (= 0.7.4)
       async_sinatra
       em-hiredis

data/lib/sensu/client.rb

@@ -52,19 +52,28 @@ module Sensu
             @settings['client'][key].to_s
           end
           if unmatched_tokens.empty?
-            EM.system('sh', '-c', command + ' 2>&1') do |output, status|
-              result['check'].merge!({'status' => status.exitstatus, 'output' => output})
+            execute = proc do
+              IO.popen(command + ' 2>&1') do |io|
+                result['check']['output'] = io.read
+              end
+              result['check']['status'] = $?.exitstatus
+              result
+            end
+            publish = proc do |result|
               @result_queue.publish(result.to_json)
-              @checks_in_progress.delete(check['name'])
+              @checks_in_progress.delete(result['check']['name'])
             end
+            EM.defer(execute, publish)
           else
-            result['check'].merge!({'status' => 3, 'output' => 'Missing client attributes: ' + unmatched_tokens.join(', ')})
+            result['check']['status'] = 3
+            result['check']['output'] = 'Missing client attributes: ' + unmatched_tokens.join(', ')
             @result_queue.publish(result.to_json)
             @checks_in_progress.delete(check['name'])
           end
         end
       else
-        result['check'].merge!({'status' => 3, 'output' => 'Unknown check'})
+        result['check']['status'] = 3
+        result['check']['output'] = 'Unknown check'
         @result_queue.publish(result.to_json)
         @checks_in_progress.delete(check['name'])
       end

data/lib/sensu/config.rb

@@ -58,19 +58,5 @@ module Sensu
       optparse.parse!(arguments)
       options
     end
-
-    def create_working_directory
-      begin
-        Dir.mkdir('/tmp/sensu')
-      rescue SystemCallError
-      end
-    end
-
-    def purge_working_directory
-      Dir.foreach('/tmp/sensu') do |file|
-        next if file == '.' || file == '..'
-        File.delete('/tmp/sensu/' + file)
-      end
-    end
   end
 end

data/lib/sensu/server.rb

@@ -7,13 +7,13 @@ module Sensu
     alias :redis_connection :redis
 
     def self.run(options={})
+      EM.threadpool_size = 15
       EM.run do
         server = self.new(options)
         server.setup_logging
         server.setup_redis
         server.setup_amqp
         server.setup_keepalives
-        server.setup_handlers
         server.setup_results
         unless server.is_worker
           server.setup_publisher
@@ -33,7 +33,6 @@ module Sensu
 
     def initialize(options={})
       config = Sensu::Config.new(:config_file => options[:config_file])
-      config.create_working_directory
       @settings = config.settings
       @is_worker = options[:worker]
     end
@@ -61,39 +60,21 @@ module Sensu
       end
     end
 
-    def setup_handlers
-      @handler_queue = EM::Queue.new
-      handlers_in_progress = 0
-      handle = Proc.new do |event|
-        if handlers_in_progress < 15
-          event_file = proc do
-            handlers_in_progress += 1
-            file_name = '/tmp/sensu/event-' + UUIDTools::UUID.random_create.to_s
-            File.open(file_name, 'w') do |file|
-              file.write(JSON.pretty_generate(event))
-            end
-            file_name
-          end
-          handler = proc do |event_file|
-            EM.system('sh', '-c', @settings['handlers'][event['check']['handler']] + ' -f ' + event_file  + ' 2>&1') do |output, status|
-              EM.debug('handled :: ' + event['check']['handler'] + ' :: ' + status.exitstatus.to_s + ' :: ' + output)
-              File.delete(event_file)
-              handlers_in_progress -= 1
-            end
-          end
-          EM.defer(event_file, handler)
-        else
-          @handler_queue.push(event)
-        end
-        EM.next_tick do
-          @handler_queue.pop(&handle)
+    def handle_event(event)
+      handler = proc do
+        result = Hash.new
+        IO.popen(@settings['handlers'][event['check']['handler']] + ' 2>&1', 'r+') do |io|
+          io.write(JSON.pretty_generate(event))
+          io.close_write
+          result['output'] = io.read
         end
+        result['status'] = $?.exitstatus
+        result
       end
-      @handler_queue.pop(&handle)
-    end
-
-    def handle_event(event)
-      @handler_queue.push(event)
+      report = proc do |result|
+        EM.debug('handled :: ' + event['check']['handler'] + ' :: ' + result['status'].to_s + ' :: ' + result['output'])
+      end
+      EM.defer(handler, report)
     end
 
     def process_result(result)
@@ -102,8 +83,8 @@ module Sensu
           client = JSON.parse(client_json)
           check = result['check']
           check.merge!(@settings['checks'][check['name']]) if @settings['checks'].has_key?(check['name'])
-          check['handler'] = 'default' unless check['handler']
-          event = {'client' => client, 'check' => check}
+          check['handler'] ||= 'default'
+          event = {'client' => client, 'check' => check, 'occurrences' => 1}
           if check['type'] == 'metric'
             handle_event(event)
           else
@@ -114,12 +95,14 @@ module Sensu
                 event['action'] = 'resolve'
                 handle_event(event)
               elsif check['status'] > 0
-                occurrences = 1
                 if previous_event && check['status'] == previous_event['status']
-                  occurrences = previous_event['occurrences'] += 1
+                  event['occurrences'] = previous_event['occurrences'] += 1
                 end
-                @redis.hset('events:' + client['name'], check['name'], {'status' => check['status'], 'output' => check['output'], 'occurrences' => occurrences}.to_json).callback do
-                  event['occurrences'] = occurrences
+                @redis.hset('events:' + client['name'], check['name'], {
+                  'status' => check['status'],
+                  'output' => check['output'],
+                  'occurrences' => event['occurrences']
+                }.to_json).callback do
                   event['action'] = 'create'
                   handle_event(event)
                 end
@@ -167,15 +150,18 @@ module Sensu
               result = {'client' => client['name'], 'check' => {'name' => 'keepalive', 'issued' => Time.now.to_i}}
               case
               when time_since_last_check >= 180
-                result['check'].merge!({'status' => 2, 'output' => 'No keep-alive sent from host in over 180 seconds'})
+                result['check']['status'] = 2
+                result['check']['output'] = 'No keep-alive sent from host in over 180 seconds'
                 @result_queue.publish(result.to_json)
               when time_since_last_check >= 120
-                result['check'].merge!({'status' => 1, 'output' => 'No keep-alive sent from host in over 120 seconds'})
+                result['check']['status'] = 1
+                result['check']['output'] = 'No keep-alive sent from host in over 120 seconds'
                 @result_queue.publish(result.to_json)
               else
                 @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
                   if exists == 1
-                    result['check'].merge!({'status' => 0, 'output' => 'Keep-alive sent from host'})
+                    result['check']['status'] = 0
+                    result['check']['output'] = 'Keep-alive sent from host'
                     @result_queue.publish(result.to_json)
                   end
                 end

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.13"
+  s.version     = "0.5.14"
   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.13
+  version: 0.5.14
 platform: ruby
 authors: 
 - Sean Porter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 Z
+date: 2011-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp