Changeset 40897 for branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications.py

Timestamp:

Oct 3, 2019, 11:51:21 AM (7 years ago)

Author:

fairlamb

Message:

Better errors, chmod wrapper, fixed config loading and tests

File:

• branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications.py (modified) (3 diffs)

branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications.py

@@ -13 +13 @@
 # a restructure would be needed
 # Ideally, the utils should be added to the path.
-import utils.subprocess_utils as sub_utils
-
-
-DEFAULT_CONFIG_FILE = path.abspath('./atlassian_backups.config')
+import subprocess_utils as sub_utils
+
+
+DEFAULT_CONFIG_FILE = path.join(path.dirname(__file__), 'atlassian_backups.config')
 
 
@@ -236 +236 @@
         jira_tar_name = datetime.date.today().strftime("%Y_%m_%d") + "_jira_attachments.tar"
         jira_tar_filepath = path.join(latest_paths[0], jira_tar_name)
-        jira_tar_args = ["-cf", jira_tar_filepath, self.jira_attachments_path]
+        jira_tar_args = ["-C", "/", "-cf", jira_tar_filepath, self.jira_attachments_path.strip('/')]
         sub_utils.tar_wrapper(jira_tar_args)
         sub_utils.chmod_wrapper(['774', jira_tar_filepath])
@@ -246 +246 @@
         confluence_tar_name = datetime.date.today().strftime("%Y_%m_%d") + "_confluence_attachments.tar"
         confluence_tar_filepath = path.join(latest_paths[0], confluence_tar_name)
-        confluence_tar_args = ["-cf", confluence_tar_filepath, self.conf_attachments_path]
+        confluence_tar_args = ["-C", "/", "-cf", confluence_tar_filepath, self.conf_attachments_path.strip('/')]
         sub_utils.tar_wrapper(confluence_tar_args)
         sub_utils.chmod_wrapper(['774', confluence_tar_filepath])