Skip to content

fix(backup): handle 7z exit codes correctly to avoid false failures #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrrobot47 merged 3 commits into from
Dec 24, 2025
Merged

fix(backup): handle 7z exit codes correctly to avoid false failures #473

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9924845
fix(backup): handle 7z exit codes correctly to avoid false failures
mrrobot47 Dec 24, 2025
184358d
fix(backup): fix formatting
mrrobot47 Dec 24, 2025
8022d20
fix(backup): add file existence checks for all 7z operations
mrrobot47 Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 46 additions & 14 deletions src/helper/Site_Backup_Restore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,13 @@ private function maybe_backup_custom_docker_compose( $backup_dir ) {
if ( $this->fs->exists( $custom_docker_compose_dir ) ) {
$custom_docker_compose_dir_archive = $backup_dir . '/user-docker-compose.zip';
$archive_command = sprintf( 'cd %s && 7z a -mx=1 %s .', $custom_docker_compose_dir, $custom_docker_compose_dir_archive );
EE::exec( $archive_command );
$result = EE::launch( $archive_command );

// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
// This is optional, so we just log a warning instead of failing
if ( $result->return_code >= 2 ) {
EE::warning( 'Failed to backup custom docker-compose directory. Continuing with backup.' );
}
}
}

Expand All @@ -431,10 +437,11 @@ private function backup_site_dir( $backup_dir ) {
$backup_file = $backup_dir . '/' . $this->site_data['site_url'] . '.zip';
$backup_command = sprintf( 'cd %s && 7z a -mx=1 %s .', $site_dir, $backup_file );

$result = EE::exec( $backup_command );
$result = EE::launch( $backup_command );

// Check if archive was created successfully
if ( ! $result || ! $this->fs->exists( $backup_file ) ) {
// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
// Exit code 1 means warnings (e.g., missing symlink targets) but archive is still created
if ( $result->return_code >= 2 || ! $this->fs->exists( $backup_file ) ) {
$this->capture_error(
'Failed to create site backup archive',
self::ERROR_TYPE_FILESYSTEM,
Expand Down Expand Up @@ -470,9 +477,10 @@ private function backup_wp_content_dir( $backup_dir ) {
}

$backup_command = sprintf( 'cd %s && 7z a -mx=1 %s wp-config.php', $site_dir . '/../', $backup_file );
$result = EE::exec( $backup_command );
$result = EE::launch( $backup_command );

if ( ! $result ) {
// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
if ( $result->return_code >= 2 || ! $this->fs->exists( $backup_file ) ) {
$this->capture_error(
'Failed to create WordPress content backup archive',
self::ERROR_TYPE_FILESYSTEM,
Expand All @@ -486,15 +494,34 @@ private function backup_wp_content_dir( $backup_dir ) {

// Include meta.json in the zip archive (Corrected logic)
$backup_command = sprintf( 'cd %s && 7z u -snl -mx=1 %s %s wp-content', $site_dir, $backup_file, $meta_file );
EE::exec( $backup_command );
$result = EE::launch( $backup_command );
// Remove the file
$this->fs->remove( $meta_file );

// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
if ( $result->return_code >= 2 || ! $this->fs->exists( $backup_file ) ) {
$this->capture_error(
'Failed to create WordPress content backup archive',
self::ERROR_TYPE_FILESYSTEM,
3002
);
EE::error( 'Failed to create backup archive. Please check disk space and file permissions.' );
}

$uploads_dir = $site_dir . '/wp-content/uploads';
if ( is_link( $uploads_dir ) ) {
$backup_command = sprintf( 'cd %s && 7z u -mx=1 %s wp-content/uploads', $site_dir, $backup_file );
EE::exec( $backup_command );
$result = EE::launch( $backup_command );

// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
if ( $result->return_code >= 2 ) {
$this->capture_error(
'Failed to create WordPress content backup archive',
self::ERROR_TYPE_FILESYSTEM,
3002
);
EE::error( 'Failed to create backup archive. Please check disk space and file permissions.' );
}
}

// Final check that backup file was created successfully
Expand All @@ -517,9 +544,10 @@ private function backup_nginx_conf( $backup_dir ) {
$backup_file = $backup_dir . '/conf.zip';
$backup_command = sprintf( 'cd %s && 7z a -mx=1 %s nginx', $conf_dir, $backup_file );

$result = EE::exec( $backup_command );
$result = EE::launch( $backup_command );

if ( ! $result ) {
// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
if ( $result->return_code >= 2 || ! $this->fs->exists( $backup_file ) ) {
$this->capture_error(
'Failed to create nginx configuration backup archive',
self::ERROR_TYPE_FILESYSTEM,
Expand All @@ -536,9 +564,10 @@ private function backup_php_conf( $backup_dir ) {
$backup_file = $backup_dir . '/conf.zip';
$backup_command = sprintf( 'cd %s && 7z u -mx=1 %s php', $conf_dir, $backup_file );

$result = EE::exec( $backup_command );
$result = EE::launch( $backup_command );

if ( ! $result ) {
// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
if ( $result->return_code >= 2 || ! $this->fs->exists( $backup_file ) ) {
$this->capture_error(
'Failed to create PHP configuration backup archive',
self::ERROR_TYPE_FILESYSTEM,
Expand Down Expand Up @@ -610,15 +639,18 @@ private function backup_db( $backup_dir ) {
EE::exec( sprintf( 'mv %s %s', $sql_dump_path, $sql_file ) );
$backup_command = sprintf( 'cd %s && 7z u -mx=1 %s sql', $backup_dir, $backup_file );

$result = EE::exec( $backup_command );
if ( ! $result ) {
$result = EE::launch( $backup_command );

// 7z exit codes: 0=success, 1=warning (non-fatal), 2+=fatal error
if ( $result->return_code >= 2 || ! $this->fs->exists( $backup_file ) ) {
$this->capture_error(
'Failed to compress database backup into archive',
self::ERROR_TYPE_FILESYSTEM,
3002
);
EE::error( 'Failed to compress database backup. Please check disk space.' );
}

$this->fs->remove( $backup_dir . '/sql' );
}

Expand Down
Loading