Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-19 09:05:22 +01:00
Code Issues Projects Releases Wiki Activity

Updates: Saner stats and rollback handling. WP.org now collects basic stats on non-auto updates as they have been hugely informative.

Browse Source 
props dd32 for initial patch.
fixes #25657.

Built from https://develop.svn.wordpress.org/trunk@25863


git-svn-id: http://core.svn.wordpress.org/trunk@25775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-22 09:49:09 +00:00
parent 56f3f3de4e
commit 097c0fd0b6
1 changed files with 85 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
wp-admin/includes/class-wp-upgrader.php
View File

@ -1316,6 +1316,8 @@ class Core_Upgrader extends WP_Upgrader {
function upgrade( $current, $args = array() ) { function upgrade( $current, $args = array() ) {
global $wp_filesystem, $wp_version; global $wp_filesystem, $wp_version;
$start_time = time();
$defaults = array( $defaults = array(
'pre_check_md5' => true, 'pre_check_md5' => true,
'attempt_rollback' => false, 'attempt_rollback' => false,
@ -1402,12 +1404,47 @@ class Core_Upgrader extends WP_Upgrader {
$rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) ); $rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
$result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], array( 'rollback' => $rollback_result, 'update' => $result ) ); $original_result = $result;
$result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], (object) array( 'update' => $original_result, 'rollback' => $rollback_result ) );
} }
} }
do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) ); do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) );
// Clear the current updates
delete_site_transient( 'update_core' );
if ( ! $parsed_args['do_rollback'] ) {
$stats = array(
'update_type' => $current->response,
'success' => true,
'fs_method' => $wp_filesystem->method,
'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
'time_taken' => time() - $start_time,
'attempted' => $current->version,
);
if ( is_wp_error( $result ) ) {
$stats['success'] = false;
// Did a rollback occur?
if ( ! empty( $try_rollback ) ) {
$stats['error_code'] = $original_result->get_error_code();
$stats['error_data'] = $original_result->get_error_data();
// Was the rollback successful? If not, collect its error too.
$stats['rollback'] = ! is_wp_error( $rollback_result );
if ( is_wp_error( $rollback_result ) ) {
$stats['rollback_code'] = $rollback_result->get_error_code();
$stats['rollback_data'] = $rollback_result->get_error_data();
}
} else {
$stats['error_code'] = $result->get_error_code();
$stats['error_data'] = $result->get_error_data();
}
}
wp_version_check( $stats );
}
return $result; return $result;
} }
@ -1906,34 +1943,13 @@ class WP_Automatic_Updater {
// Next, Process any core update // Next, Process any core update
wp_version_check(); // Check for Core updates wp_version_check(); // Check for Core updates
$extra_update_stats = array();
$core_update = find_core_auto_update(); $core_update = find_core_auto_update();
if ( $core_update ) { if ( $core_update )
$start_time = time(); $this->update( 'core', $core_update );
$core_update_result = $this->update( 'core', $core_update );
delete_site_transient( 'update_core' );
$extra_update_stats['success'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_code() : true;
$extra_update_stats['error_data'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_data() : '';
if ( is_wp_error( $core_update_result ) && 'rollback_was_required' == $core_update_result->get_error_code() ) {
$rollback_data = $core_update_result->get_error_data();
$extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update'];
$extra_update_stats['error_data'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_data() : '';
$extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : true; // If it's not a WP_Error, the rollback was successful.
$extra_update_stats['rollback_data'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_data() : '';
}
$extra_update_stats['fs_method'] = $GLOBALS['wp_filesystem']->method;
$extra_update_stats['fs_method_forced'] = defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' );
$extra_update_stats['time_taken'] = ( time() - $start_time );
$extra_update_stats['attempted'] = $core_update->version;
}
// Clean up, and check for any pending translations // Clean up, and check for any pending translations
wp_version_check( $extra_update_stats ); // check for Core updates // (Core_Upgrader checks for core updates)
wp_update_themes(); // Check for Theme updates wp_update_themes(); // Check for Theme updates
wp_update_plugins(); // Check for Plugin updates wp_update_plugins(); // Check for Plugin updates
@ -1999,23 +2015,28 @@ class WP_Automatic_Updater {
$critical = false; $critical = false;
if ( $error_code === 'disk_full' || false !== strpos( $error_code, '__copy_dir' ) ) { if ( $error_code === 'disk_full' || false !== strpos( $error_code, '__copy_dir' ) ) {
$critical = true; $critical = true;
} elseif ( $error_code === 'rollback_was_required' ) { } elseif ( $error_code === 'rollback_was_required' && is_wp_error( $result->get_error_data()->rollback ) ) {
$error_data = $result->get_error_data(); // A rollback is only critical if it failed too.
if ( is_wp_error( $error_data['rollback'] ) )
$critical = true; $critical = true;
$rollback_result = $result->get_error_data()->rollback;
} elseif ( false !== strpos( $error_code, 'do_rollback' ) ) { } elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
$critical = true; $critical = true;
} }
if ( $critical ) { if ( $critical ) {
update_site_option( 'auto_core_update_failed', array( $critical_data = array(
'attempted' => $core_update->current, 'attempted' => $core_update->current,
'current' => $wp_version, 'current' => $wp_version,
'error_code' => $error_code, 'error_code' => $error_code,
'error_data' => $result->get_error_data(), 'error_data' => $result->get_error_data(),
'timestamp' => time(), 'timestamp' => time(),
'critical' => true, 'critical' => true,
) ); );
if ( isset( $rollback_result ) ) {
$critical_data['rollback_code'] = $rollback_result->get_error_code();
$critical_data['rollback_data'] = $rollback_result->get_error_data();
}
update_site_option( 'auto_core_update_failed', $critical_data );
$this->send_email( 'critical', $core_update, $result ); $this->send_email( 'critical', $core_update, $result );
return; return;
} }
@ -2163,11 +2184,27 @@ class WP_Automatic_Updater {
$body .= "\n***\n\n"; $body .= "\n***\n\n";
$body .= __( 'We have some data that describes the error your site encountered.' ); $body .= __( 'We have some data that describes the error your site encountered.' );
$body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' ); $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
$body .= "\n\n" . sprintf( __( "Error code: %s" ), $result->get_error_code() );
if ( $result->get_error_message() ) // If we had a rollback and we're still critical, then the rollback failed too.
$body .= "\n" . $result->get_error_message(); // Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
if ( $result->get_error_data() ) if ( 'rollback_was_required' == $result->get_error_code() )
$body .= "\n" . implode( ', ', (array) $result->get_error_data() ); $errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
else
$errors = array( $result );
foreach ( $errors as $error ) {
if ( ! is_wp_error( $error ) )
continue;
$error_code = $error->get_error_code();
$body .= "\n\n" . sprintf( __( "Error code: %s" ), $error_code );
if ( 'rollback_was_required' == $error_code )
continue;
if ( $error->get_error_message() )
$body .= "\n" . $error->get_error_message();
$error_data = $error->get_error_data();
if ( $error_data )
$body .= "\n" . implode( ', ', (array) $error_data );
}
$body .= "\n"; $body .= "\n";
} }
@ -2278,9 +2315,17 @@ class WP_Automatic_Updater {
foreach ( $update->messages as $message ) foreach ( $update->messages as $message )
$body[] = " " . html_entity_decode( str_replace( '…', '...', $message ) ); $body[] = " " . html_entity_decode( str_replace( '…', '...', $message ) );
if ( is_wp_error( $update->result ) ) { if ( is_wp_error( $update->result ) ) {
$body[] = ' Error: [' . $update->result->get_error_code() . '] ' . $update->result->get_error_message(); $results = array( 'update' => $update->result );
if ( $update->result->get_error_data() ) // If we rolled back, we want to know an error that occurred then too.
$body[] = ' ' . implode( ', ', (array) $update->result->get_error_data() ); if ( 'rollback_was_required' === $update->result->get_error_code() )
$results = (array) $update->result->get_error_data();
foreach ( $results as $result_type => $result ) {
if ( ! is_wp_error( $result ) )
continue;
$body[] = ' ' . ( 'rollback' === $result_type ? 'Rollback ' : '' ) . 'Error: [' . $result->get_error_code() . '] ' . $result->get_error_message();
if ( $result->get_error_data() )
$body[] = ' ' . implode( ', ', (array) $result->get_error_data() );
}
} }
$body[] = ''; $body[] = '';
} }