Skip to content

Commit 93dbe67

Browse files
author
Till Brehm
committed
Merge branch '6776-borg-files-changed' into 'develop'
Allow exit code 1 from borg(files changed while backing up), #6776 Closes #6776 See merge request ispconfig/ispconfig3!1960
2 parents 12965af + 85936b1 commit 93dbe67

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

server/lib/classes/backup.inc.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,11 @@ protected static function make_web_backup($web_domain, $backup_job)
19941994
'cd ? && ' . $command . ' ' . $command_opts . ' ' . $excludes . ' ? .',
19951995
$web_path, $backup_repos_path . '::' . $web_backup_archive
19961996
);
1997-
$success = $app->system->last_exec_retcode() == 0;
1997+
// Exit code 1 means a file changed during backup, not ideal but not a failure either.
1998+
if ($app->system->last_exec_retcode() == 1) {
1999+
$app->log('Backup of web files for domain ' . $web_domain['domain'] . ' using path ' . $web_path . ' mentined file changed while we backed it up.', LOGLEVEL_DEBUG);
2000+
}
2001+
$success = ($app->system->last_exec_retcode() == 0 || $app->system->last_exec_retcode() == 1)?true:false;
19982002
}
19992003

20002004
if ($success) {

0 commit comments

Comments
 (0)