sensu 0.8.4 → 0.8.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sensu (0.8.3)
+    sensu (0.8.5)
       amqp (= 0.7.4)
       async_sinatra
       cabin (= 0.1.7)

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/lib/sensu/config.rb

@@ -13,6 +13,11 @@ module Sensu
     attr_accessor :settings, :logger
 
     def initialize(options={})
+      @logger = Cabin::Channel.new
+      log_dir = File.writable?('/var/log') ? '/var/log' : '/tmp'
+      ruby_logger = Logger.new(File.join(log_dir, 'sensu.log'))
+      @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
+      @logger.level = options[:verbose] ? 'debug' : 'info'
       config_file = options[:config_file] || '/etc/sensu/config.json'
       if File.readable?(config_file)
         begin
@@ -23,11 +28,6 @@ module Sensu
       else
         invalid_config('configuration file does not exist or is not readable: ' + config_file)
       end
-      @logger = Cabin::Channel.new
-      log_dir = File.writable?('/var/log') ? '/var/log' : '/tmp'
-      ruby_logger = Logger.new(File.join(log_dir, 'sensu.log'))
-      @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
-      @logger.level = options[:verbose] ? 'debug' : 'info'
       validate_config(options['type'])
     end
 
@@ -41,6 +41,15 @@ module Sensu
         has_keys(%w[redis api])
       when 'client'
         has_keys(%w[client checks])
+        unless @settings.client.name.is_a?(String)
+          invalid_config('client must have a name')
+        end
+        unless @settings.client.address.is_a?(String)
+          invalid_config('client must have an address (ip or hostname)')
+        end
+        unless @settings.client.subscriptions.is_a?(Array) && @settings.client.subscriptions.count > 0
+          invalid_config('client must have subscriptions')
+        end
       end
       @settings.checks.each do |name, details|
         unless details.interval.is_a?(Integer) && details.interval > 0
@@ -53,15 +62,6 @@ module Sensu
           invalid_config('missing subscribers for check ' + name)
         end
       end
-      unless @settings.client.name.is_a?(String)
-        invalid_config('client must have a name')
-      end
-      unless @settings.client.address.is_a?(String)
-        invalid_config('client must have an address (ip or hostname)')
-      end
-      unless @settings.client.subscriptions.is_a?(Array) && @settings.client.subscriptions.count > 0
-        invalid_config('client must have subscriptions')
-      end
       if type
         @logger.debug('[config] -- configuration valid -- running ' + type)
         puts 'configuration valid -- running ' + type
@@ -90,7 +90,6 @@ module Sensu
         end
         current_process = $0.split('/').last
         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
           end
@@ -98,7 +97,7 @@ module Sensu
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE (default: /etc/sensu/config.json)') do |file|
           options[:config_file] = file
         end
-        opts.on('-v', '--verbose', 'Enable verbose logging') do
+        opts.on('-v', '--verbose', 'Enable verbose logging (default: false)') do
           options[:verbose] = true
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 -08:00
+date: 2011-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency