k3nny/TISbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: - vmdk imports

Browse Source 
- stats logs with rsync
This commit is contained in:
ssamson-tis
2015-03-25 12:27:57 +01:00
parent a9aa653b02
commit d554c478f2
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtisbackup/backup_rsync.py
+7 -6
View File
@@ -139,7 +139,7 @@ class backup_rsync(backup_generic):
backup_source = '%s@%s::%s%s' % (self.remote_user, self.server_name, self.rsync_module, self.remote_dir)
else:
# case of rsync + ssh
ssh_params = ['-o StrictHostKeyChecking=no','-c blowfish']
ssh_params = ['-o StrictHostKeyChecking=no','-c %s' % self.cipher_spec]
if self.private_key:
ssh_params.append('-i %s' % self.private_key)
if self.ssh_port <> 22:
@@ -168,13 +168,13 @@ class backup_rsync(backup_generic):
for l in log.splitlines():
if l.startswith('Number of files:'):
stats['total_files_count'] += int(l.split(':')[1])
stats['total_files_count'] += int(re.sub("[^0-9]", "", l.split(':')[1]))
if l.startswith('Number of files transferred:'):
stats['written_files_count'] += int(l.split(':')[1])
stats['written_files_count'] += int(re.sub("[^0-9]", "", l.split(':')[1]))
if l.startswith('Total file size:'):
stats['total_bytes'] += int(l.split(':')[1].split()[0])
stats['total_bytes'] += int(re.sub("[^0-9]", "", l.split(':')[1].split()[0]))
if l.startswith('Total transferred file size:'):
stats['written_bytes'] += int(l.split(':')[1].split()[0])
stats['written_bytes'] += int(re.sub("[^0-9]", "", l.split(':')[1].split()[0]))
returncode = process.returncode
## deal with exit code 24 (file vanished)
@@ -310,7 +310,8 @@ class backup_rsync_ssh(backup_rsync):
"""Backup a directory on remote server with rsync and ssh protocol (requires rsync software on remote host)"""
type = 'rsync+ssh'
required_params = backup_generic.required_params + ['remote_user','remote_dir','private_key']
optional_params = backup_generic.optional_params + ['compression','bwlimit','ssh_port','exclude_list','protect_args','overload_args']
optional_params = backup_generic.optional_params + ['compression','bwlimit','ssh_port','exclude_list','protect_args','overload_args', 'cipher_spec']
cipher_spec = 'cipher_spec'
register_driver(backup_rsync)