Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 19 additions & 2 deletions includes/Feed/AbstractFeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use WooCommerce\Facebook\Framework\Helper;
use WooCommerce\Facebook\Framework\Plugin\Exception as PluginException;
use WooCommerce\Facebook\Utilities\Heartbeat;
use WooCommerce\Facebook\Framework\Logger;

defined( 'ABSPATH' ) || exit;

Expand Down Expand Up @@ -232,7 +233,15 @@ public function get_feed_secret(): string {
*/
public function handle_feed_data_request(): void {
$name = static::get_data_stream_name();
\WC_Facebookcommerce_Utils::log_with_debug_mode_enabled( "{$name} feed: Meta is requesting feed file." );
Logger::log(
"{$name} feed: Meta is requesting feed file.",
[],
array(
'should_send_log_to_meta' => false,
'should_save_log_in_woocommerce' => true,
'woocommerce_log_level' => \WC_Log_Levels::DEBUG,
)
);

$file_path = $this->feed_writer->get_file_path();
$file = false;
Expand Down Expand Up @@ -277,7 +286,15 @@ public function handle_feed_data_request(): void {
// fpassthru might be disabled in some hosts (like Flywheel).
// phpcs:ignore
if ( \WC_Facebookcommerce_Utils::is_fpassthru_disabled() || ! @fpassthru( $file ) ) {
\WC_Facebookcommerce_Utils::log_with_debug_mode_enabled( "{$name} feed: fpassthru is disabled: getting file contents." );
Logger::log(
"{$name} feed: fpassthru is disabled: getting file contents.",
[],
array(
'should_send_log_to_meta' => false,
'should_save_log_in_woocommerce' => true,
'woocommerce_log_level' => \WC_Log_Levels::DEBUG,
)
);
//phpcs:ignore
$contents = @stream_get_contents( $file );
if ( ! $contents ) {
Expand Down
11 changes: 10 additions & 1 deletion includes/Feed/FeedConfigurationDetection.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use WooCommerce\Facebook\Framework\Api\Exception as ApiException;
use WooCommerce\Facebook\Products\Feed;
use WooCommerce\Facebook\Utilities\Heartbeat;
use WooCommerce\Facebook\Framework\Logger;

/**
* A class responsible detecting feed configuration.
Expand Down Expand Up @@ -91,7 +92,15 @@ private function get_data_source_feed_tracker_info() {
$metadata = $this->get_feed_metadata( $feed['id'] );
} catch ( Exception $e ) {
$message = sprintf( 'There was an error trying to get feed metadata: %s', $e->getMessage() );
WC_Facebookcommerce_Utils::log_with_debug_mode_enabled( $message );
Logger::log(
$message,
[],
array(
'should_send_log_to_meta' => false,
'should_save_log_in_woocommerce' => true,
'woocommerce_log_level' => \WC_Log_Levels::ERROR,
)
);
continue;
}

Expand Down
21 changes: 18 additions & 3 deletions includes/fbproductfeed.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,15 @@ public function generate_feed() {
do_action('wc_facebook_feed_generation_completed');

} catch ( \Exception $exception ) {

\WC_Facebookcommerce_Utils::log_with_debug_mode_enabled( $exception->getMessage() );
Logger::log(
$exception->getMessage(),
[],
array(
'should_send_log_to_meta' => false,
'should_save_log_in_woocommerce' => true,
'woocommerce_log_level' => \WC_Log_Levels::ERROR,
)
);
// Feed generation failed - clear the generation time to track that there's an issue.
facebook_for_woocommerce()->get_tracker()->track_feed_file_generation_time( -1 );

Expand Down Expand Up @@ -279,7 +286,15 @@ public function write_product_feed_file( $wp_ids ) {

} catch ( Exception $e ) {

WC_Facebookcommerce_Utils::log_with_debug_mode_enabled( wp_json_encode( $e->getMessage() ) );
Logger::log(
wp_json_encode( $e->getMessage() ),
[],
array(
'should_send_log_to_meta' => false,
'should_save_log_in_woocommerce' => true,
'woocommerce_log_level' => \WC_Log_Levels::ERROR,
)
);

$written = false;

Expand Down
12 changes: 11 additions & 1 deletion tests/Unit/Feed/ProductFeedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* @package FacebookCommerce
*/

use WooCommerce\Facebook\Framework\Logger;

if ( ! defined( 'ABSPATH' ) ) {
exit;
}
Expand Down Expand Up @@ -43,7 +45,15 @@ public function get_product_wpid() {
*/
public function log_feed_progress( $msg, $data = array() ) {
$msg = empty( $data ) ? $msg : $msg . wp_json_encode( $data );
WC_Facebookcommerce_Utils::log_with_debug_mode_enabled( 'Test - ' . $msg );
Logger::log(
'Test - ' . $msg,
[],
array(
'should_send_log_to_meta' => false,
'should_save_log_in_woocommerce' => true,
'woocommerce_log_level' => \WC_Log_Levels::DEBUG,
)
);
}
}

Expand Down