Changeset 40912 for branches/ipp-259_genericise_backups/tools/backups/backup_atlassian_applications.py

Timestamp:

Oct 4, 2019, 4:50:00 PM (7 years ago)

Author:

fairlamb

Message:

that function was used - moved it to generic; separated out jira/conf tar

File:

• branches/ipp-259_genericise_backups/tools/backups/backup_atlassian_applications.py (modified) (3 diffs)

branches/ipp-259_genericise_backups/tools/backups/backup_atlassian_applications.py

@@ -90 +90 @@
 
         # Move latest to tmp (and delete if move ok)
-        gen_utils.copy_multiple_items_to_multiple_dirs(latest_paths, tmp_paths, self.verbose)
+        gen_utils.move_dirs(latest_paths, tmp_paths, self.verbose)
+
+        return_status = []
 
         # copy jira
-        jira_return = self._copy_jira_backup(self.verbose)
+        return_status.append(self._copy_jira_backup(self.verbose))
 
         # copy confluence
-        conf_return = self._copy_confluence_backup(self.verbose)
+        return_status.append(self._copy_confluence_backup(self.verbose))
 
         # tarfiles:
-        tar_return = self._tar_attachments()
+        return_status.append(self._tar_jira_attachments())
+        return_status.append(self._tar_conf_attachments())
 
         # mysqldump
-        mysqldump_return = self.make_mysql_dump(self.mysqldump_password)
+        return_status.append(self.make_mysql_dump(self.mysqldump_password))
 
         # If successful: move tmp to old
-        if jira_return == 0 and conf_return == 0 and tar_return == 0 and mysqldump_return == 0:
-            gen_utils.copy_multiple_items_to_multiple_dirs(tmp_paths, old_paths, self.verbose)
+        failures = [ rs for rs in return_status if rs != 0 ]
+        if len(failures) == 0:
+            gen_utils.move_dirs(tmp_paths, old_paths, self.verbose)
         else:
             # If any failed: delete latest, move tmp back
-            gen_utils.copy_multiple_items_to_multiple_dirs(tmp_paths, latest_paths, self.verbose)
+            gen_utils.move_dirs(tmp_paths, latest_paths, self.verbose)
             return 5
 
@@ -177 +181 @@
         return 0
 
-    def _tar_attachments(self):
+    def _tar_jira_attachments(self):
         # tar jira
         latest_paths = self.target_paths("latest")
@@ -191 +195 @@
         sub_utils.cp_wrapper([ jira_tar_filepath, latest_paths[1]])
         sub_utils.cp_wrapper([ jira_tar_filepath, latest_paths[2]])
+        return 0
+
+
+    def _tar_conf_attachments(self):
+        latest_paths = self.target_paths("latest")
+        if not self.target_backup_paths_ok():
+            return 1
 
         # tar confluence