From ac7eaed3f70e2821e9c7a313f84c0aa1546f080a Mon Sep 17 00:00:00 2001 From: SeiyaGame <40237982+SeiyaGame@users.noreply.github.com> Date: Wed, 2 Apr 2025 22:24:44 +0200 Subject: [PATCH] (feat) Another Remove --progress by default Stdout cannot be entire if it contains too much data and the server doesn't have enough RAM --- libtisbackup/backup_rsync_btrfs.py | 8 ++++---- libtisbackup/common.py | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libtisbackup/backup_rsync_btrfs.py b/libtisbackup/backup_rsync_btrfs.py index 8fc93b0..0c88af8 100644 --- a/libtisbackup/backup_rsync_btrfs.py +++ b/libtisbackup/backup_rsync_btrfs.py @@ -80,11 +80,11 @@ class backup_rsync_btrfs(backup_generic): else: print(('btrfs subvolume create "%s"' %dest_dir)) + options = ['-rt', '--stats', '--delete-excluded', '--numeric-ids', '--delete-after', '--partial'] - - options = ['-rt','--stats','--delete-excluded','--numeric-ids','--delete-after'] - if self.logger.level: - options.append('-P') + if self.logger.level == logging.DEBUG: + self.logger.warning(f"[{self.backup_name}] Note that stdout cannot be entire if it contains too much data and the server doesn't have enough RAM !") + options.append('--progress') if self.dry_run: options.append('-d') diff --git a/libtisbackup/common.py b/libtisbackup/common.py index 044f666..8ce6bfa 100644 --- a/libtisbackup/common.py +++ b/libtisbackup/common.py @@ -862,9 +862,11 @@ class backup_generic(ABC): if not os.path.isdir(backup_dest): os.makedirs(backup_dest) - options = ['-aP','--stats','--delete-excluded','--numeric-ids','--delete-after'] - if self.logger.level: - options.append('-P') + options = ['-a', '--stats', '--delete-excluded', '--numeric-ids', '--delete-after', '--partial'] + + if self.logger.level == logging.DEBUG: + self.logger.warning(f"[{self.backup_name}] Note that stdout cannot be entire if it contains too much data and the server doesn't have enough RAM !") + options.append('--progress') if self.dry_run: options.append('-d')