corosync-commander 0.1.0.0 → 0.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ffd9a76d120685a5cc4ca5b46d63f416c25f2ac
-  data.tar.gz: 8c9f81c68f0ac85a2bc053f634e0f61a8f86257a
+  metadata.gz: 411024404c9dd35180971bf19f7f41c72ccba755
+  data.tar.gz: 2572ee7e38c1c0e95c8dd579095b2bb1639f68b8
 SHA512:
-  metadata.gz: 5e6ca5cd16bca2f7e87392357cc65de13e6e9f53608d8b3f87f1aef52332f1df86a027bc56abed06a42263ac52627612730bb371664837f0c42d82e263a2375b
-  data.tar.gz: e001b910753074d6633c0704f7c10099119d6d6dcd006e20851e5c4b46a443a1edfe5f19aac1cd37aad39cd59c86ff856db545a7ea8195f9cdff48ef7c61f81a
+  metadata.gz: 4b55b096da38c71c50316307891237ea7151cfd78c23a2f2842b8845f0eb68eaceb85dae7bf548206290a2439bc3747332caff9a08fdb3fe97441044809c626a
+  data.tar.gz: 093df1adcc6b2a8b77a9e3042c85f3b86f7b69bd7eb181d855332651f7abca7e87d87ee99311ef337021f6b8381dcc8f69ca8dc49ac5ee9d1ef35d3055c48c75

data/Gemfile

@@ -1,8 +1,8 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'corosync', '~>0.1.0'
-#gem 'corosync', :path => '/home/phemmer/git/ruby-corosync'
+#gem 'corosync', :git => 'git@github.com:phemmer/ruby-corosync.git'
+gem 'corosync', '~>0.2.0.0'
 
 group :development do
 	gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    corosync (0.1.0.0)
+    corosync (0.2.0.0)
       ffi (~> 1.9)
     diff-lcs (1.2.4)
     ffi (1.9.3)
@@ -23,7 +23,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  corosync (~> 0.1.0)
+  corosync (~> 0.2.0.0)
   rake
   rdoc
   rspec

data/README.md

@@ -10,21 +10,21 @@ The key to this is that when you send a message to the cluster, you receive your
 
 There is a fully working example in the `examples` directory, but here's a brief condensed version:
 
-require 'corosync_commander'
-cc = CorosyncCommander.new
-cc.commands.register('shell command') do |sender, shellcmd|
-  %x{#{shellcmd}}
-end
-cc.join('remote commands')
+    require 'corosync_commander'
+    cc = CorosyncCommander.new
+    cc.commands.register('shell command') do |sender, shellcmd|
+      %x{#{shellcmd}}
+    end
+    cc.join('remote commands')
 
-exe = cc.execute([], 'shell command', 'hostname')
-  enum = exe.to_enum
-  begin
-    enum.each do |sender, response|
-      $stdout.write "#{sender.nodeid}:#{sender.pid}: #{response.chomp}\n"
+    exe = cc.execute([], 'shell command', 'hostname')
+      enum = exe.to_enum
+      begin
+        enum.each do |sender, response|
+          $stdout.write "#{sender.nodeid}:#{sender.pid}: #{response.chomp}\n"
+        end
+      rescue CorosyncCommander::RemoteException => e
+        puts "Caught remote exception: #{e}"
+        retry
+      end
     end
-  rescue CorosyncCommander::RemoteException => e
-    puts "Caught remote exception: #{e}"
-    retry
-  end
-end

data/VERSION

@@ -1 +1 @@
-0.1.0.0
+0.2.0.0

data/lib/corosync_commander/execution/message.rb

@@ -9,7 +9,7 @@ class CorosyncCommander::Execution::Message
 	attr_accessor :type
 	attr_accessor :content
 
-	def self.from_cpg_message(data, sender)
+	def self.from_cpg_message(sender, data)
 		data = JSON.parse(data)
 
 		recipients = Corosync::CPG::MemberList.new

data/lib/corosync_commander.rb

@@ -94,18 +94,23 @@ class CorosyncCommander
 	# Starts watching for notifications
 	# @return [void]
 	def start
-		@quorum.start(true)
+		@quorum.start
 
 		@dispatch_thread = Thread.new do
-			Thread.current.abort_on_exception = true
-			loop do
-				select_ready = select([@cpg.fd, @quorum.fd], [], [])
-				if select_ready[0].include?(@quorum.fd) then
-					@quorum.dispatch
-				end
-				if select_ready[0].include?(@cpg.fd) then
-					@cpg.dispatch
+			begin
+				loop do
+					select_ready = select([@cpg.fd, @quorum.fd], [], [])
+					if select_ready[0].include?(@quorum.fd) then
+						@quorum.dispatch
+					end
+					if select_ready[0].include?(@cpg.fd) then
+						@cpg.dispatch
+					end
 				end
+			rescue Exception => e
+				# something happened that we don't know how to handle. We need to bail out.
+				$stderr.write "Fatal exception: #{e.to_s} (#{e.class})\n#{e.backtrace.join("\n")}\n"
+				exit(1)
 			end
 		end
 	end
@@ -151,6 +156,7 @@ class CorosyncCommander
 	private :next_execution_id
 
 	# Used as a callback on receipt of a CPG message
+	# @param sender [Corosync::CPG::Member] Sender of the message
 	# @param message [String] data structure passed to @cpg.send
 	#   * message[0] == [Array<String>] Each string is "nodeid:pid" of the intended message recipients
 	#   * msgid == [Integer]
@@ -161,10 +167,9 @@ class CorosyncCommander
 	#     * In the event of a command, this will be the arguments passed to CorosyncCommander.send
 	#     * In the event of a response, this will be the return value of the command handler
 	#     * In the event of an exception, this will be the exception string and backtrace
-	# @param sender [Corosync::CPG::Member] Sender of the message
 	# @!visibility private
-	def cpg_message(message, sender)
-		message = CorosyncCommander::Execution::Message.from_cpg_message(message, sender)
+	def cpg_message(sender, message)
+		message = CorosyncCommander::Execution::Message.from_cpg_message(sender, message)
 
 		# This is the possible message classifications
 		# Command echo (potentially also a command to us)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corosync-commander
 version: !ruby/object:Gem::Version
-  version: 0.1.0.0
+  version: 0.2.0.0
 platform: ruby
 authors:
 - Patrick Hemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corosync