Upload/Rsync/Rsync: Adding a function get_dest_dir() to work like in RsyncUploadThread (#270)

This function returns the joined result of the rsync path and the base dir, exactly like in RsyncUploadThread. This commit adds this function and uses it in the prepare_dest_dir() and in the rsync_config that gets logged.

Author: corey-hammerton

mongodb_consistent_backup/Upload/Rsync/Rsync.py

@@ -66,14 +66,17 @@ def host_has_rsync(self):
             return True
         return False
 
+    def get_dest_path(self):
+        return os.path.join(self.rsync_path, self.base_dir)
+
     def prepare_dest_dir(self):
         # mkdir -p the rsync dest path via ssh
         ssh_mkdir_cmd = ["ssh"]
         if self.rsync_ssh_key:
             ssh_mkdir_cmd.extend(["-i", self.rsync_ssh_key])
         ssh_mkdir_cmd.extend([
             "%s@%s" % (self.rsync_user, self.rsync_host),
-            "mkdir", "-p", self.rsync_path
+            "mkdir", "-p", self.get_dest_path()
         ])
 
         # run the mkdir via ssh
@@ -100,7 +103,7 @@ def run(self):
             self.prepare_dest_dir()
 
             rsync_config = {
-                "dest": "%s@%s:%s" % (self.rsync_user, self.rsync_host, self.rsync_path),
+                "dest": "%s@%s:%s" % (self.rsync_user, self.rsync_host, self.get_dest_path()),
                 "threads": self.threads(),
                 "retries": self.retries
             }