diff --git a/includes/run.php b/includes/run.php index a5a5ac04ec705194a698b20b42e9b6f9f4c002b5..39421ed91b2ee23d39fa86716f7edef8dc38d7d6 100644 --- a/includes/run.php +++ b/includes/run.php @@ -6,6 +6,7 @@ */ namespace Automattic\WP\WP_CLI_Cron_Control_Offload; +use WP_CLI; /** * Intended for non-interactive use, so all output ends up in the error log @@ -23,13 +24,13 @@ function run_event( $command ) { if ( ! validate_command( $command ) ) { /* translators: 1: Plugin's prefix for log messages, 2. WP-CLI command that would have run */ - trigger_error( sprintf( __( '%1$s: Attempted to run blocked WP-CLI command. (%2$s)', 'wp-cli-cron-control-offload' ), MESSAGE_PREFIX, var_export( $command, true ) ), E_USER_WARNING ); + trigger_error( sprintf( __( '%1$s: Attempted to run blocked command. (%2$s)', 'wp-cli-cron-control-offload' ), MESSAGE_PREFIX, var_export( $command, true ) ), E_USER_WARNING ); return; } $start = microtime( true ); - $output = \WP_CLI::runcommand( $command, array( + $output = WP_CLI::runcommand( $command, array( 'exit_error' => false, // Don't kill the cron process if the WP-CLI command fails, otherwise we can't capture the error. 'launch' => true, // Don't reuse as we're in cron context. 'return' => 'all', // We want STDERR and the exit code, in addition to STDOUT. @@ -40,7 +41,7 @@ function run_event( $command ) { // Command failed. if ( ! is_object( $output ) || is_wp_error( $output ) ) { /* translators: 1: Plugin's prefix for log messages, 2. Command error that caused failure */ - trigger_error( sprintf( __( '%1$s: WP-CLI command failed. (%2$s)', 'wp-cli-cron-control-offload' ), MESSAGE_PREFIX, var_export( $command, true ) ), E_USER_WARNING ); + trigger_error( sprintf( __( '%1$s: Command failed. (%2$s)', 'wp-cli-cron-control-offload' ), MESSAGE_PREFIX, var_export( $command, true ) ), E_USER_WARNING ); $message = is_wp_error( $output ) ? $output->get_error_message() : var_export( $output, true ); trigger_error( $message, E_USER_WARNING );