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

Timestamp:

Oct 7, 2019, 1:25:05 PM (7 years ago)

Author:

fairlamb

Message:

separate out jira and confluence from the main call

File:

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

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

@@ -79 +79 @@
                ]
 
-    def perform_atlassian_backups(self):
+    def perform_backups(self):
 
         # Check all paths are ok first:
@@ -92 +92 @@
         gen_utils.move_dirs(latest_paths, tmp_paths, self.verbose)
 
-        return_status = []
-
-        # copy jira
-        return_status.append(self._copy_jira_backup(self.verbose))
-
-        # copy confluence
-        return_status.append(self._copy_confluence_backup(self.verbose))
-
-        # tarfiles:
-        return_status.append(self._tar_jira_attachments())
-        return_status.append(self._tar_conf_attachments())
-
-        # mysqldump
-        return_status.append(self.make_mysql_dump(self.mysqldump_password))
+        return_status = self._jira_backups()
+        return_status = return_status + self._conf_backups()
+        return_status = return_status + self._db_dump()
 
         # If successful: move tmp to old
@@ -119 +108 @@
 
         return 0
+
+    def _jira_backups(self):
+        return_status = []
+        return_status.append(self._copy_jira_backup(self.verbose))
+        return_status.append(self._tar_jira_attachments())
+        return return_status
+
+    def _conf_backups(self):
+        return_status = []
+        return_status.append(self._copy_confluence_backup(self.verbose))
+        return_status.append(self._tar_conf_attachments())
+        return return_status
+
+    def _db_dump(self):
+        return [self.make_mysql_dump(self.mysqldump_password)]
 
     def get_jira_backup_date_format(self, custom_date=None):
@@ -197 +201 @@
         return 0
 
-
     def _tar_conf_attachments(self):
         latest_paths = self.target_paths("latest")
@@ -261 +264 @@
 
     def run(self):
-        return self.perform_atlassian_backups()
+        return self.perform_backups()