Changeset 41059 for branches/ipp-350_add_to_jira_conf_backups/backup.py

Timestamp:

Nov 5, 2019, 9:17:31 AM (7 years ago)

Author:

fairlamb

Message:

Added rsync to jira/conf schema and tests to boot

File:

• branches/ipp-350_add_to_jira_conf_backups/backup.py (modified) (2 diffs)

branches/ipp-350_add_to_jira_conf_backups/backup.py

@@ -83 +83 @@
 
         self.read_config_and_schema(config, schema)
-        # self.read_copy_config_section(config, schema)
-        # self.read_tar_config_section(config, schema)
-        # self.read_rsync_config_section(config, schema)
-        # self.read_mysqldump_config_section(config, schema)
 
     def read_config_and_schema(self, config: ConfigParser, schema: ConfigSchema):
@@ -206 +202 @@
         self.target_backup_paths_ok(raise_error=True)
         backup_paths = self.default_dict['backup_paths']
-        for bp in backup_paths:
-            # if not path.exists(bp):
-            #     raise errs.ValidationError(f"ValidationError: target path does not exist: {bp}")
-
-            for s in self.rsync_dict['sources']:
-                if not path.exists(s):
+
+        sources = self.rsync_dict['sources']
+        for i in range(0, len(sources)):
+            s = sources[i]
+            if not path.exists(s):
                     raise errs.ValidationError(f"ValidationError: target path does not exist: {s}")
+
+            for bp in backup_paths:
                 try:
                     args = [s, bp]
+
                     if 'additional_args' in self.rsync_dict.keys():
                         args = args + self.rsync_dict['additional_args']
                     sub_utils.local_rsync_wrapper(args)
+
                 except errs.SubprocessError as e:
                     raise errs.SubprocessError( f"Error: rsync\n"