Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • feat/message-handling
  • feat/request-id
  • master
  • 0.1
  • 1.0
  • 1.1
  • 1.1.1
  • 1.10.0
  • 1.10.1
  • 1.10.2
  • 1.11.0
  • 1.11.0-beta1
  • 1.11.0-beta2
  • 1.12.0
  • 1.12.1
  • 1.13.0
  • 1.13.1
  • 1.13.2
  • 1.2.0
  • 1.3.0
  • 1.4.0
  • 1.5.0
  • 1.5.1
  • 1.5.2
  • 1.5.3
  • 1.5.4
  • 1.6.0
  • 1.6.1
  • 1.6.2
  • 1.6.2-beta
  • 1.6.2-beta2
  • 1.7.0
  • 1.7.1
  • 1.7.2
  • 1.7.3
  • 1.7.4
  • 1.8.0
  • 1.9.0
38 results

Target

Select target project
  • wpdesk/wp-logs
1 result
Select Git revision
  • feat/message-handling
  • feat/request-id
  • master
  • 0.1
  • 1.0
  • 1.1
  • 1.1.1
  • 1.10.0
  • 1.10.1
  • 1.10.2
  • 1.11.0
  • 1.11.0-beta1
  • 1.11.0-beta2
  • 1.12.0
  • 1.12.1
  • 1.13.0
  • 1.13.1
  • 1.13.2
  • 1.2.0
  • 1.3.0
  • 1.4.0
  • 1.5.0
  • 1.5.1
  • 1.5.2
  • 1.5.3
  • 1.5.4
  • 1.6.0
  • 1.6.1
  • 1.6.2
  • 1.6.2-beta
  • 1.6.2-beta2
  • 1.7.0
  • 1.7.1
  • 1.7.2
  • 1.7.3
  • 1.7.4
  • 1.8.0
  • 1.9.0
38 results
Show changes
Commits on Source (4)
## [1.10.2] - 2022-11-15
### Fixed
- Deprecated error in PHP 8.X
## [1.10.1] - 2022-10-01
### Fixed
- WC logger initialisation
## [1.10.0] - 2022-08-16
### Added
- en_CA, en_GB translators
......
......@@ -15,4 +15,15 @@ final class Settings {
/** @var bool */
public $use_wp_log = true;
/**
* @param string $level
* @param bool $use_wc_log
* @param bool $use_wp_log
*/
public function __construct( string $level = LogLevel::DEBUG, bool $use_wc_log = true, bool $use_wp_log = true ) {
$this->level = $level;
$this->use_wc_log = $use_wc_log;
$this->use_wp_log = $use_wp_log;
}
}
......@@ -30,23 +30,37 @@ final class SimpleLoggerFactory implements LoggerFactory {
return $this->logger;
}
$logger = new Logger( $this->channel );
$this->logger = new Logger( $this->channel );
if ( $this->options->use_wc_log && \function_exists( 'wc_get_logger' ) ) {
$logger->pushHandler(
new WooCommerceHandler(
\wc_get_logger(),
$this->channel
)
);
if ( $this->options->use_wc_log ) {
if ( \function_exists( 'wc_get_logger' ) ) {
$this->create_wc_handler();
} else {
\add_action( 'woocommerce_init', [ $this, 'create_wc_handler' ] );
}
}
// Adding WooCommerce logger may have failed, if so add WP by default.
if ( $this->options->use_wp_log || empty( $logger->getHandlers() ) ) {
$logger->pushHandler( $this->get_wp_handler() );
if ( $this->options->use_wp_log || empty( $this->logger->getHandlers() ) ) {
$this->logger->pushHandler( $this->get_wp_handler() );
}
return $this->logger = $logger;
return $this->logger;
}
/**
* @internal
*/
public function create_wc_handler() {
while ( ! $this->options->use_wp_log && ! empty( $this->logger->getHandlers() ) ) {
$this->logger->popHandler();
}
$this->logger->pushHandler(
new WooCommerceHandler(
\wc_get_logger(),
$this->channel
)
);
}
private function get_wp_handler(): HandlerInterface {
......
......@@ -42,7 +42,7 @@ if ( ! class_exists( 'WPDesk_Logger_Factory' ) ) {
*
* @see http://php.net/manual/en/function.debug-backtrace.php
*/
public static function log_wp_error( WP_Error $e, array $backtrace ) {
public static function log_wp_error( WP_Error $e, array $backtrace = array() ) {
$message = 'Error: ' . get_class( $e ) . ' Code: ' . $e->get_error_code() . ' Message: ' . $e->get_error_message();
self::log_message_backtrace( $message, WPDesk_Logger::ERROR, $backtrace );
......@@ -79,7 +79,7 @@ if ( ! class_exists( 'WPDesk_Logger_Factory' ) ) {
* @param string $level Level of error.
* @param array $backtrace Backtrace information with snapshot of error env.
*/
public static function log_message_backtrace( $message, $level = WPDesk_Logger::DEBUG, array $backtrace ) {
public static function log_message_backtrace( $message, $level = WPDesk_Logger::DEBUG, array $backtrace = array() ) {
$message .= ' Backtrace: ' . json_encode( $backtrace );
if (isset($backtrace[ self::BACKTRACE_FILENAME_KEY ])) {
$filename = $backtrace[ self::BACKTRACE_FILENAME_KEY ];
......