ey_stonith 0.1.5.pre2 → 0.1.5.pre3

data/lib/ey_stonith/awsm_notifier.rb

@@ -46,13 +46,13 @@ module EY
       end
 
       # ripped from restclient so we can use eventmachine
-      def process_payload(p = nil, parent_key = nil)
-        p.keys.map do |k|
+      def process_payload(payload = nil, parent_key = nil)
+        payload.keys.map do |k|
           key = parent_key ? "#{parent_key}[#{k}]" : k
-          if p[k].is_a? Hash
-            process_payload(p[k], key)
+          if payload[k].is_a? Hash
+            process_payload(payload[k], key)
           else
-            value = URI.escape(p[k].to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+            value = URI.escape(payload[k].to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
             "#{key}=#{value}"
           end
         end.join("&")

data/lib/ey_stonith/commands/abstract.rb

@@ -63,6 +63,14 @@ module EY
           end
         end
 
+        def script
+          @script ||= File.join(File.dirname($0), SCRIPT_NAME)
+        end
+
+        def execute(command, args = "")
+          exec "#{script}-#{command}#{command_options} #{args}"
+        end
+
         def parse!
           parser.parse!(@argv)
         end

data/lib/ey_stonith/commands/check.rb

@@ -45,7 +45,7 @@ module EY
 
           if check_recorder.limit_exceeded?
             Stonith.logger.info "Invoking takeover of instance #{instance_id}"
-            exec "#{SCRIPT_NAME} takeover#{command_options} --instance #{instance_id}"
+            execute :takeover, "--instance #{instance_id}"
           end
         end
 

data/lib/ey_stonith/commands/claim.rb

@@ -35,6 +35,7 @@ module EY
           return unless master_hostname
 
           if config.meta_data_hostname == master_hostname
+            history << :claim
             abort "Already claimed, not claiming."
           else
             claim_path.delete
@@ -85,6 +86,7 @@ Failed attempts: #{attempts}
 
           if config.meta_data_hostname == master_hostname
             claim_path.open('w') {}
+            history << :claim
             abort "Already claimed, not claiming. Touching claim file."
           else
             abort "#{master_hostname} is master, not claiming."

data/lib/ey_stonith/commands/cron.rb

@@ -11,6 +11,7 @@ module EY
         end
 
         def invoke
+          Stonith.logger.info "Stonith started"
           heartbeat_loop do |beat|
             unless_stopped { run_commands if beat.zero? }
             sleep 1
@@ -31,7 +32,7 @@ module EY
 
         def run_commands
           %w[claim notify check].each do |cmd|
-            system("stonith #{cmd}#{command_options}")
+            system("#{script} #{cmd}#{command_options}")
           end
         end
       end

data/lib/ey_stonith/commands/resume.rb

@@ -11,6 +11,7 @@ module EY
         end
 
         def invoke
+          Stonith.logger.info "Stonith resumed"
           config.stop_path.delete if config.stop_path.exist?
         end
       end

data/lib/ey_stonith/commands/stop.rb

@@ -13,6 +13,8 @@ module EY
         def invoke
           config.stop_path.open('w') {}
           sleep(0.5) until history.last == "stop"
+
+          Stonith.logger.info "Stonith stopped"
           puts "takeover" if history.include?(:takeover)
         end
       end

data/lib/ey_stonith/commands/takeover.rb

@@ -73,7 +73,8 @@ module EY
           data = Data.new(config.meta_data_hostname, config.meta_data_id, ip)
           database.set data
 
-          exec "#{SCRIPT_NAME} notify --force#{command_options}"
+          takeover_path.delete
+          execute :notify, "--force"
         end
 
         def relent!

data/lib/ey_stonith/commands.rb

@@ -26,7 +26,7 @@ module EY
 
       def self.invoke(argv)
         if COMMANDS.keys.include?(argv.first)
-          exec "stonith-#{argv.join(' ')}"
+          exec "#{File.dirname($0)}/stonith-#{argv.join(' ')}"
         else
           NotFound.new(argv).call
         end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 5
-  - pre2
-  version: 0.1.5.pre2
+  - pre3
+  version: 0.1.5.pre3
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -07:00
+date: 2010-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency