mondupe 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff88c3505fd4a307852ae8685f9f9ad8bb15c3b8
-  data.tar.gz: 106b4f838fef4fe9ccb7df6c19a3a4f588da13d8
+  metadata.gz: dc78120740c79e0004d0229600494145ced3a460
+  data.tar.gz: 411facd28bd4a82f4ab275a0de75daf42cba72a8
 SHA512:
-  metadata.gz: 25496dd68a2b805032a9f1fc9a7f4b14bec20d46607514f7d54c5fe6e2f363bb69fc8f4f78cda237243133438e23914f63e49c5c3a842b8c13a9074484207744
-  data.tar.gz: efdd126b458627a5b25f71f7e1fc842d37cb88e55d1562aeaa56cf0429597d2526a983f33f121347c4c74695906a8f0e90cfac63c56a66e2dbb5a7de85466eda
+  metadata.gz: 9c23948d38c775187131f6f203d715f23c47fb762fc03c59b0f6e26efe67870de6b13953a76b600fc654f81edbb21d2dde1048b33f47a135d7ccb5b903f14b06
+  data.tar.gz: cf5806525cec2fed74d65e99192e9aeafa054e93d2c55a9465395bdb1fd6911c7a56dcb2914d2db4759696624cde7d8a14574436261c5750bf3ffb650ed8b655

data/lib/mondupe.rb

@@ -124,23 +124,33 @@ class Mondupe
     # Restore from the database dump
     # TODO - Fail the process if any step fails
     abort "You must specify a database name to drop and restore. Use -n [name] or ENV['MONGO_DB_NAME'] to set this value." if mongo_db_name.nil?
+    ssh_command = "ssh -i #{ssh_key} #{ssh_user}@#{instance_ip}"
     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
     puts "#{Time.now.to_s} - Dropping existing database"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "echo 'db.dropDatabase()' | #{db_connect_string}"`
+    `#{ssh_command} "echo 'db.dropDatabase()' | #{db_connect_string}"`
     if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else abort("Error dropping database") end
     puts "Extracting database dump archive file..."
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "cd #{dump_tmp_path}; tar xf #{dump_file_name}"`
+    `#{ssh_command} cd #{dump_tmp_path}; tar xf #{dump_file_name}"`
     if $?.success? then puts "#{Time.now.to_s} - Extraction complete!" else abort("Error extracting archive") end
     puts "Restoring Mongo Database from extracted dump: #{File.join(dump_tmp_path, "#{mongo_db_name}")}"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "time mongorestore #{File.join(dump_tmp_path, "#{mongo_db_name}")}"`
+    `#{ssh_command} "time mongorestore #{File.join(dump_tmp_path, "#{mongo_db_name}")}"`
     if $?.success? then puts "#{Time.now.to_s} - Database restore complete!" else abort("Error restoring databse") end
     puts "Removing database archive file"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, dump_file_name)}"`
+    `#{ssh_command} "rm -rf #{File.join(dump_tmp_path, dump_file_name)}"`
     if $?.success? then puts "#{Time.now.to_s} - Archive removed!" else abort("Error removing archive") end
     puts "#{Time.now.to_s} - Cleaning up our mess..."
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, "#{mongo_db_name}")}"`
+    `#{ssh_command} "rm -rf #{File.join(dump_tmp_path, "#{mongo_db_name}")}"`
     if $?.success? then puts "#{Time.now.to_s} - Mess cleaned up!" else abort("Error cleaning up after myself...") end
   end
 

metadata

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