sensu 0.9.0.beta.1 → 0.9.0.beta.2

data/lib/sensu.rb

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

data/lib/sensu/api.rb

@@ -253,6 +253,7 @@ module Sensu
 
     def self.test(options={})
       self.setup(options)
+      $settings.client.timestamp = Time.now.to_i
       $redis.set('client:' + $settings.client.name, $settings.client.to_json).callback do
         $redis.sadd('clients', $settings.client.name).callback do
           $redis.hset('events:' + $settings.client.name, 'test', {

data/lib/sensu/config.rb

@@ -17,15 +17,14 @@ 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',
       :config_dir => '/etc/sensu/conf.d',
       :validate => true,
+      :daemonize => false,
       :pid_file => '/tmp/' + File.basename($0) + '.pid',
-      :daemonize => false
+      :service => File.basename($0)
     }
 
     def initialize(options={})
@@ -42,7 +41,7 @@ module Sensu
     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]))
-        ruby_logger = case SERVICE
+        ruby_logger = case @options[:service]
         when 'rake'
           Logger.new(@options[:log_file])
         else
@@ -93,49 +92,27 @@ module Sensu
         @logger.debug('[config] -- validating configuration')
       end
       has_keys(%w[rabbitmq])
-      case SERVICE
-      when 'server', 'rake'
+      validate_common_config
+      case @options[:service]
+      when 'rake'
+        has_keys(%w[redis api handlers checks client])
+        validate_server_config
+        validate_client_config
+      when 'sensu-server'
         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
-          case details.type
-          when 'pipe'
-            unless details.key?('command')
-              invalid_config('missing command for pipe handler ' + name)
-            end
-          when 'amqp'
-            unless details.key?('exchange')
-              invalid_config('missing exchange details for amqp handler ' + name)
-            end
-            unless details.exchange.key?('name')
-              invalid_config('missing exchange name for amqp handler ' + name)
-            end
-          else
-            invalid_config('unknown type for handler ' + name)
-          end
-        end
-      when 'api', 'rake'
+        validate_server_config
+      when 'sensu-api'
         has_keys(%w[redis api])
-      when 'client', 'rake'
+      when 'sensu-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
+        validate_client_config
+      end
+      if @logger
+        @logger.debug('[config] -- configuration valid -- running ' + @options[:service])
       end
+    end
+
+    def validate_common_config
       @settings.checks.each do |name, details|
         unless details.interval.is_a?(Integer) && details.interval > 0
           invalid_config('missing interval for check ' + name)
@@ -157,8 +134,46 @@ module Sensu
           end
         end
       end
-      if @logger
-        @logger.debug('[config] -- configuration valid -- running ' + SERVICE)
+    end
+
+    def validate_server_config
+      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
+        case details.type
+        when 'pipe'
+          unless details.key?('command')
+            invalid_config('missing command for pipe handler ' + name)
+          end
+        when 'amqp'
+          unless details.key?('exchange')
+            invalid_config('missing exchange details for amqp handler ' + name)
+          end
+          unless details.exchange.key?('name')
+            invalid_config('missing exchange name for amqp handler ' + name)
+          end
+        else
+          invalid_config('unknown type for handler ' + name)
+        end
+      end
+    end
+
+    def validate_client_config
+      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
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196273
+  hash: 62196279
   prerelease: true
   segments: 
   - 0
   - 9
   - 0
   - beta
-  - 1
-  version: 0.9.0.beta.1
+  - 2
+  version: 0.9.0.beta.2
 platform: ruby
 authors: 
 - Sean Porter