sensu 0.9.0.beta → 0.9.0.beta.1

data/bin/sensu-api

@@ -4,5 +4,4 @@ $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE_
 require 'sensu/api'
 
 options = Sensu::Config.read_arguments(ARGV)
-options['type'] = 'api'
 Sensu::API.run(options)

data/bin/sensu-client

@@ -4,5 +4,4 @@ $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE_
 require 'sensu/client'
 
 options = Sensu::Config.read_arguments(ARGV)
-options['type'] = 'client'
 Sensu::Client.run(options)

data/bin/sensu-server

@@ -4,5 +4,4 @@ $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE_
 require 'sensu/server'
 
 options = Sensu::Config.read_arguments(ARGV)
-options['type'] = 'server'
 Sensu::Server.run(options)

data/lib/sensu.rb

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

data/lib/sensu/api.rb

@@ -25,7 +25,7 @@ module Sensu
     def self.setup(options={})
       config = Sensu::Config.new(options)
       $settings = config.settings
-      $logger = config.open_log
+      $logger = config.logger || config.open_log
       if options[:daemonize]
         Process.daemonize
       end

data/lib/sensu/client.rb

@@ -26,7 +26,7 @@ module Sensu
     def initialize(options={})
       config = Sensu::Config.new(options)
       @settings = config.settings
-      @logger = config.open_log
+      @logger = config.logger || config.open_log
     end
 
     def stop(signal)

data/lib/sensu/config.rb

@@ -17,6 +17,8 @@ module Sensu
   class Config
     attr_accessor :settings, :logger
 
+    SERVICE = File.basename($0).split('-').last
+
     DEFAULT_OPTIONS = {
       :log_file => '/tmp/sensu.log',
       :config_file => '/etc/sensu/config.json',
@@ -28,16 +30,27 @@ module Sensu
 
     def initialize(options={})
       @options = DEFAULT_OPTIONS.merge(options)
+      if options[:log_file]
+        open_log
+      end
       read_config
-      validate_config if @options[:validate]
+      if @options[:validate]
+        validate_config
+      end
     end
 
     def open_log
       @logger = Cabin::Channel.new
       if File.writable?(@options[:log_file]) || !File.exist?(@options[:log_file]) && File.writable?(File.dirname(@options[:log_file]))
-        STDOUT.reopen(@options[:log_file], 'a')
-        STDERR.reopen(STDOUT)
-        ruby_logger = Logger.new(STDOUT)
+        ruby_logger = case SERVICE
+        when 'rake'
+          Logger.new(@options[:log_file])
+        else
+          STDOUT.reopen(@options[:log_file], 'a')
+          STDERR.reopen(STDOUT)
+          STDOUT.sync = true
+          Logger.new(STDOUT)
+        end
       else
         invalid_config('log file is not writable: ' + @options[:log_file])
       end
@@ -67,22 +80,29 @@ module Sensu
             invalid_config('configuration snippet file (' + snippet_file + ') must be valid JSON: ' + error.to_s)
           end
           merged_settings = @settings.to_hash.deep_merge(snippet_hash)
-          @logger.warn('[settings] configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json) if @logger
+          if @logger
+            @logger.warn('[settings] configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json)
+          end
           @settings = Hashie::Mash.new(merged_settings)
         end
       end
     end
 
     def validate_config
-      @logger.debug('[config] -- validating configuration') if @logger
+      if @logger
+        @logger.debug('[config] -- validating configuration')
+      end
       has_keys(%w[rabbitmq])
-      case @options['type']
-      when 'server'
+      case SERVICE
+      when 'server', 'rake'
         has_keys(%w[redis handlers checks])
         unless @settings.handlers.include?('default')
           invalid_config('missing default handler')
         end
         @settings.handlers.each do |name, details|
+          unless details.is_a?(Hash)
+            invalid_config('hander details must be a hash ' + name)
+          end
           unless details.key?('type')
             invalid_config('missing type for handler ' + name)
           end
@@ -102,9 +122,9 @@ module Sensu
             invalid_config('unknown type for handler ' + name)
           end
         end
-      when 'api'
+      when 'api', 'rake'
         has_keys(%w[redis api])
-      when 'client'
+      when 'client', 'rake'
         has_keys(%w[client checks])
         unless @settings.client.name.is_a?(String)
           invalid_config('client must have a name')
@@ -137,9 +157,8 @@ module Sensu
           end
         end
       end
-      if @options['type']
-        @logger.debug('[config] -- configuration valid -- running ' + @options['type']) if @logger
-        puts 'configuration valid -- running ' + @options['type']
+      if @logger
+        @logger.debug('[config] -- configuration valid -- running ' + SERVICE)
       end
     end
 
@@ -152,7 +171,6 @@ module Sensu
     end
 
     def invalid_config(message)
-      @logger.error('[config] -- configuration invalid -- ' + message) if @logger
       raise 'configuration invalid, ' + message
     end
 
@@ -163,7 +181,6 @@ module Sensu
           puts opts
           exit
         end
-        current_process = File.basename($0)
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE (default: /etc/sensu/config.json)') do |file|
           options[:config_file] = file
         end

data/lib/sensu/helpers/ruby.rb

@@ -47,6 +47,9 @@ end
 
 module Process
   def self.write_pid(pid_file)
+    if pid_file.nil?
+      raise 'a pid file path must be provided'
+    end
     begin
       File.open(pid_file, 'w') do |file|
         file.write(self.pid.to_s + "\n")
@@ -63,8 +66,10 @@ module Process
       raise 'cannot detach from controlling terminal'
     end
     trap 'SIGHUP', 'IGNORE'
-    exit if pid = fork
-    Dir.chdir "/"
+    if pid = fork
+      exit
+    end
+    Dir.chdir('/')
     ObjectSpace.each_object(IO) do |io|
       unless [STDIN, STDOUT, STDERR].include?(io)
         begin

data/lib/sensu/server.rb

@@ -34,7 +34,7 @@ module Sensu
     def initialize(options={})
       config = Sensu::Config.new(options)
       @settings = config.settings
-      @logger = config.open_log
+      @logger = config.logger || config.open_log
     end
 
     def stop(signal)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 31098121
+  hash: 62196273
   prerelease: true
   segments: 
   - 0
   - 9
   - 0
   - beta
-  version: 0.9.0.beta
+  - 1
+  version: 0.9.0.beta.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 -08:00
+date: 2011-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency