Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Refactor Newsletter and Bridge to use logger_factory instance

Browse Source 
[MAILPOET-2444]
This commit is contained in:
Rostislav Wolny
2019-10-08 11:23:26 +02:00
committed by Jack Kitterhing
parent e4262b0a6d
commit 0a4aa5ce3f
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Newsletter/AutomatedLatestContent.php
View File

@ -12,9 +12,13 @@ class AutomatedLatestContent {
private $newsletter_id; private $newsletter_id;
private $newer_than_timestamp; private $newer_than_timestamp;
/** @var LoggerFactory */
private $logger_factory;
function __construct($newsletter_id = false, $newer_than_timestamp = false) { function __construct($newsletter_id = false, $newer_than_timestamp = false) {
$this->newsletter_id = $newsletter_id; $this->newsletter_id = $newsletter_id;
$this->newer_than_timestamp = $newer_than_timestamp; $this->newer_than_timestamp = $newer_than_timestamp;
$this->logger_factory = LoggerFactory::getInstance();
} }
function filterOutSentPosts($where) { function filterOutSentPosts($where) {
@ -42,7 +46,7 @@ class AutomatedLatestContent {
$current_user_id = WPFunctions::get()->getCurrentUserId(); $current_user_id = WPFunctions::get()->getCurrentUserId();
WPFunctions::get()->wpSetCurrentUser(0); WPFunctions::get()->wpSetCurrentUser(0);
LoggerFactory::getLogger('post-notifications')->addInfo( $this->logger_factory->getLogger('post-notifications')->addInfo(
'loading automated latest content', 'loading automated latest content',
['args' => $args, 'posts_to_exclude' => $posts_to_exclude, 'newsletter_id' => $this->newsletter_id, 'newer_than_timestamp' => $this->newer_than_timestamp] ['args' => $args, 'posts_to_exclude' => $posts_to_exclude, 'newsletter_id' => $this->newsletter_id, 'newer_than_timestamp' => $this->newer_than_timestamp]
); );
@ -91,7 +95,7 @@ class AutomatedLatestContent {
WPFunctions::get()->addAction('pre_get_posts', [$this, 'ensureConsistentQueryType'], $filter_priority); WPFunctions::get()->addAction('pre_get_posts', [$this, 'ensureConsistentQueryType'], $filter_priority);
$this->_attachSentPostsFilter(); $this->_attachSentPostsFilter();
LoggerFactory::getLogger('post-notifications')->addInfo( $this->logger_factory->getLogger('post-notifications')->addInfo(
'getting automated latest content', 'getting automated latest content',
['parameters' => $parameters] ['parameters' => $parameters]
); );
@ -166,7 +170,7 @@ class AutomatedLatestContent {
'post_date' => $post->post_date, 'post_date' => $post->post_date,
]; ];
} }
LoggerFactory::getLogger('post-notifications')->addInfo( $this->logger_factory->getLogger('post-notifications')->addInfo(
'automated latest content loaded posts', 'automated latest content loaded posts',
['posts' => $posts_to_log] ['posts' => $posts_to_log]
); );

14
lib/Newsletter/Scheduler/PostNotificationScheduler.php
View File

@ -23,8 +23,15 @@ class PostNotificationScheduler {
const INTERVAL_IMMEDIATE = 'immediate'; const INTERVAL_IMMEDIATE = 'immediate';
const INTERVAL_MONTHLY = 'monthly'; const INTERVAL_MONTHLY = 'monthly';
/** @var LoggerFactory */
private $logger_factory;
public function __construct() {
$this->logger_factory = LoggerFactory::getInstance();
}
function transitionHook($new_status, $old_status, $post) { function transitionHook($new_status, $old_status, $post) {
LoggerFactory::getLogger('post-notifications')->addInfo( $this->logger_factory->getLogger('post-notifications')->addInfo(
'transition post notification hook initiated', 'transition post notification hook initiated',
[ [
'post_id' => $post->ID, 'post_id' => $post->ID,
@ -40,7 +47,7 @@ class PostNotificationScheduler {
} }
function schedulePostNotification($post_id) { function schedulePostNotification($post_id) {
LoggerFactory::getLogger('post-notifications')->addInfo( $this->logger_factory->getLogger('post-notifications')->addInfo(
'schedule post notification hook', 'schedule post notification hook',
['post_id' => $post_id] ['post_id' => $post_id]
); );
@ -88,7 +95,7 @@ class PostNotificationScheduler {
$sending_task->status = SendingQueue::STATUS_SCHEDULED; $sending_task->status = SendingQueue::STATUS_SCHEDULED;
$sending_task->scheduled_at = $next_run_date; $sending_task->scheduled_at = $next_run_date;
$sending_task->save(); $sending_task->save();
LoggerFactory::getLogger('post-notifications')->addInfo( $this->logger_factory->getLogger('post-notifications')->addInfo(
'schedule post notification', 'schedule post notification',
['sending_task' => $sending_task->id(), 'scheduled_at' => $next_run_date] ['sending_task' => $sending_task->id(), 'scheduled_at' => $next_run_date]
); );
@ -135,5 +142,4 @@ class PostNotificationScheduler {
$relation->save(); $relation->save();
return $relation->value; return $relation->value;
} }
} }

5
lib/Services/Bridge/API.php
View File

@ -22,6 +22,8 @@ class API {
private $api_key; private $api_key;
private $wp; private $wp;
/** @var LoggerFactory */
private $logger_factory;
public $url_me = 'https://bridge.mailpoet.com/api/v0/me'; public $url_me = 'https://bridge.mailpoet.com/api/v0/me';
public $url_premium = 'https://bridge.mailpoet.com/api/v0/premium'; public $url_premium = 'https://bridge.mailpoet.com/api/v0/premium';
@ -37,6 +39,7 @@ class API {
} else { } else {
$this->wp = $wp; $this->wp = $wp;
} }
$this->logger_factory = LoggerFactory::getInstance();
} }
function checkMSSKey() { function checkMSSKey() {
@ -81,7 +84,7 @@ class API {
} }
function logCurlInformation($headers, $info) { function logCurlInformation($headers, $info) {
LoggerFactory::getLogger('mss')->addInfo( $this->logger_factory->getLogger('mss')->addInfo(
'requests-curl.after_request', 'requests-curl.after_request',
['headers' => $headers, 'curl_info' => $info] ['headers' => $headers, 'curl_info' => $info]
); );