ey_cloud_server 1.4.49 → 1.4.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b322ebd431ff9f4bd27a8a908d145ad4e70f01e9
-  data.tar.gz: 4a67d4081f42712cd36e8d683f1b00f767196d7a
+  metadata.gz: 71e9b1c4d7b201fb07ffd37a228682237b59a439
+  data.tar.gz: 98db024600f2556e0ac35f9b0378020ed7cc6251
 SHA512:
-  metadata.gz: 25bf1195e76d0042b379f7bc3aa9fb21e7ff30b5ab8b0b93cabc698c54032ec8dc15a20cd3b163e3d314fda03404310ca4e437fd2612d4d87e0714469b791499
-  data.tar.gz: 1211cea6558f7b4d1639bc686d24c015522fd35a69f55733b6cc7091a2a7e66ae2b920e597e48b009d99734701c19301d5188a306989f15074fe0b02744bb0d7
+  metadata.gz: b5044503b66680d4a0701fc7f804077208b55dab7dd2315c1cb5acd3836fe79eca258fb5eb7048522e0151411049e7ffcea662e8735b00f382ccfae8c37cfbfd
+  data.tar.gz: a85c33114c5abc10986dd37eb4507c1428b07ca4b111e3dff2086c938d8532330949d7f45220e938af1ce62718f116a293d13cfc83f4317409edb421303efa74

data/lib/ey_backup/engines/mysql_engine.rb

@@ -24,18 +24,19 @@ module EY
       end
 
       def load(database_name, file)
-        cycle_database(database_name)
         command = "cat #{file}"
 
-        if gpg?
-          raise "Cannot load a GPG backup"
+        if file =~ /.gpz$/ # GPG?
+          abort "Cannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load using the mysql client."
         else
           command << " | " << GZipper.gunzip
         end
+        
+        cycle_database(database_name)
 
-        command << " | mysql #{username_option} #{host_option} #{database_name}"
+        command << " | mysql #{username_option} #{host_option} #{database_name} 2> /tmp/eybackup.$$.dumperr"
 
-        run(command)
+        run(command, database_name)
       end
       
       def check_if_replica

data/lib/ey_backup/engines/postgresql_engine.rb

@@ -21,15 +21,15 @@ module EY
       end
 
       def load(database_name, file)
+        if file =~ /.gpz$/ # GPG?
+          abort "Cannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load with pg_restore."
+        end
+
         cycle_database(database_name)
 
         command = "cat #{file}"
 
-        if gpg?
-          raise "Cannot load a GPG backup"
-        end
-
-        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --clean --format=c -Upostgres -d #{database_name}"
+        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --clean --format=c -Upostgres -d #{database_name} 2> /tmp/eybackup.$$.dumperr"
 
         run(command, database_name)
       end

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.49'
+    VERSION = '1.4.50'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey_cloud_server
 version: !ruby/object:Gem::Version
-  version: 1.4.49
+  version: 1.4.50
 platform: ruby
 authors:
 - EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json