mondupe 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf37972e592daef1fd97f2983ce65c7a15f88bfd
-  data.tar.gz: 3fb5c14ccb04b8499896e16961594e0211d8dc33
+  metadata.gz: 09d1178f6114f5753a0085ebd2cb18b9a00002fd
+  data.tar.gz: 13ab96c86ca846ff06af27e71bbecad50acaaa2f
 SHA512:
-  metadata.gz: 52a6896ee4c9eed48d5741b932da09ae882f7872789744adba4d1e148b04242f32519a08c03e48cf467ad40712e9c64a845377fa76b9620d5ef03dd63a674a89
-  data.tar.gz: 1a8a7d6ec18aaaaef258a05a7af40caae96782923756d6ccbdb0dbf07163e85aaf2d563a062f21b07afb3043c88370f0b24d1e1b4144707dff34a5b479dba1d3
+  metadata.gz: 1ab3b7c62aeb7cabbb332da35483ea1d695014c5d6abba1f218c3b1c86c87fc011f2dfd983b60b14ac01dd8f97ca236a360f3203236c69e323649dfcf9a3c2bd
+  data.tar.gz: 725e2f6dfdf4fb4f8bc60a3cb67dbbe37bece5ecad4251028170d7092e25a99a48f75d9666e1a1a345976f9cbece8ae83e0ab92593ad5e004e94e4fcd1642584

data/bin/mondupe

@@ -95,6 +95,7 @@ opt_parser = OptionParser.new do |opt|
 
   opt.on("-h","--help","help") do
     puts opt_parser
+    exit
   end
 
   opt.separator "Environment Variables - Set these in your environment. They should be self explanitory."

data/lib/mondupe.rb

@@ -86,21 +86,25 @@ class Mondupe
     end
   end
 
+  def try_command(tries, command)
+    begin
+      `#{command}` or raise "Failure"
+    rescue
+      tries -= 1
+      if tries > 0
+        puts "Trying again. #{tries} left."
+        retry
+      end
+      puts "Failed after #{tries} retries..."
+    end
+  end
 
   def bootstrap(instance_name, instance_fqdn, instance_ipaddress, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
     # Bootstrap the new instance with chef
     puts "Bootstraping node with Chef..."
     puts "Running..."
     #puts "#{knife_exec} bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo"
-    tries = 20
-    begin
-      sleep 30
-      system("#{knife_exec} bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo") or raise "Knife bootstrap failed"
-    rescue
-      tries -= 1
-      puts "Cannot connect to node, trying again... #{tries} left."
-      retry if tries > 0
-    end
+    try_command(20, "#{knife_exec} bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo") or abort "Knife bootstrap failed"
   end
 
   def get_db_dump_from_s3(instance_ip, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
@@ -128,15 +132,7 @@ class Mondupe
     db_connect_string = "mongo #{mongo_db_name}"
     db_connect_string << " -u \"#{mongo_user}\" -p \"#{mongo_pass}\"" if !mongo_user.nil? && !mongo_pass.nil?
     db_connect_string << " --authenticationDatabase \"#{mongo_auth_db}\"" if !mongo_auth_db.nil?
-    tries = 20
-    begin
-      `#{ssh_command} "echo 'db.serverStatus()' | #{db_connect_string}"` or raise "Connection failed..."
-      sleep 20
-    rescue
-      tries -= 1
-      puts "Could not connect to DB. Trying again... #{tries} left."
-      retry if tries > 0
-    end
+    try_command(20, "#{ssh_command} \"echo 'db.serverStatus()' | #{db_connect_string}\"") or abort "Failed to connect"
     puts "#{Time.now.to_s} - Dropping existing database"
     `#{ssh_command} "#{db_connect_string} --eval 'db.dropDatabase()'"`
     if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else abort("Error dropping database") end
@@ -162,7 +158,7 @@ class Mondupe
     #puts "Connect String: #{db_connect_string}"
     puts "#{Time.now.to_s} - Running command on #{instance_dns} against #{mongo_db_name}"
     puts "JS Query: #{java_command}"
-    db_output = `ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} "#{db_connect_string} --eval '#{java_command}'"`
+    db_output = try_command(20, "ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} \"#{db_connect_string} --eval '#{java_command}'\"") or abort "Failed to run command"
     puts db_output
     if $?.success? then puts "#{Time.now.to_s} - Command execution complete" else abort("Error executing command") end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mondupe
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Philip Hutchins