ey_stonith 0.1.1 → 0.1.2

data/lib/ey_stonith/cli.rb

@@ -11,6 +11,7 @@ module EY
         :dna      => "/etc/chef/dna.json",
         :history  => "/var/run/ey-monitor.history",
         :pid_path => "/var/run/ey-monitor.pid",
+        :log_path => "/var/log/ey-monitor.log",
       }
 
       def self.commands
@@ -29,7 +30,9 @@ module EY
 
       command :start do
         with_pid do
-          EY::Stonith.meta_data = @options[:meta_data] if @options[:meta_data]
+          Stonith.meta_data = @options[:meta_data] if @options[:meta_data]
+          Stonith.logger = Logger.new(@config.log_path)
+          Stonith.logger.level = Logger::INFO
           EM.run { Box.new(@config, @history).start }
         end
       end
@@ -55,8 +58,8 @@ module EY
 
       def initialize(command, argv)
         parse!(argv)
-        @config = Config.new(@options[:ey], @options[:redis], @options[:dna], @options[:history], @options[:pid_path])
-        cmd = command.to_sym || :start
+        @config = Config.new(@options[:ey], @options[:redis], @options[:dna], @options[:history], @options[:pid_path], @options[:log_path])
+        cmd = command ? command.to_sym : :start
         @history = History.new(@config.history_path)
         instance_eval(&self.class.commands[cmd.to_sym])
       end
@@ -113,7 +116,11 @@ COMMANDS
 
           parser.on('-p', '--pid [FILE]', "Location of stonith pid file (default #{@options[:pid_path]}") do |path|
             @options[:pid_path] = Pathname.new(path)
-          end          
+          end
+
+          parser.on('-l', '--log [FILE]', "Location of stonith log file (default #{@options[:log_path]}") do |path|
+            @options[:log_path] = Pathname.new(path)
+          end
 
           parser.on_tail("-h", "--help", "Show this message") do
             puts parser

data/lib/ey_stonith/config.rb

@@ -3,7 +3,7 @@ require 'json'
 
 module EY
   module Stonith
-    class Config < Struct.new(:ey_cloud, :redis_yml, :dna_json, :history_path, :pid_path)
+    class Config < Struct.new(:ey_cloud, :redis_yml, :dna_json, :history_path, :pid_path, :log_path)
       def initialize(*args)
         super *args.map { |arg| arg && Pathname.new(arg) }
       end

data/lib/ey_stonith.rb

@@ -21,9 +21,10 @@ module EY
     autoload :MetaData,       'ey_stonith/meta_data'
     autoload :Slave,          'ey_stonith/slave'
 
-    @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::INFO
+    def self.logger=(logger) @@logger = logger end
     def self.logger() @@logger end
+    self.logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
 
     def self.meta_data() @@meta_data end
     def self.meta_data=(meta) @@meta_data = meta end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency