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

Use CronHelper service in API and UI classes [MAILPOET-2459]

Browse Source
This commit is contained in:
wxa
2019-10-30 16:27:47 +03:00
committed by Jack Kitterhing
parent 81caa04479
commit 31d224ea4f
5 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AdminPages/Pages/Help.php
View File

@ -18,18 +18,22 @@ class Help {
/** @var State */
private $tasks_state;
function __construct(PageRenderer $page_renderer, State $tasks_state) {
/** @var CronHelper */
private $cron_helper;
function __construct(PageRenderer $page_renderer, State $tasks_state, CronHelper $cron_helper) {
$this->page_renderer = $page_renderer;
$this->tasks_state = $tasks_state;
$this->cron_helper = $cron_helper;
}
function render() {
$system_info_data = Beacon::getData();
$cron_ping_response = CronHelper::pingDaemon();
$cron_ping_response = $this->cron_helper->pingDaemon();
$system_status_data = [
'cron' => [
'url' => CronHelper::getCronUrl(CronDaemon::ACTION_PING),
'isReachable' => CronHelper::validatePingResponse($cron_ping_response),
'url' => $this->cron_helper->getCronUrl(CronDaemon::ACTION_PING),
'isReachable' => $this->cron_helper->validatePingResponse($cron_ping_response),
'pingResponse' => $cron_ping_response,
],
'mss' => [
@ -37,10 +41,10 @@ class Help {
['isReachable' => Bridge::pingBridge()] :
false,
],
'cronStatus' => CronHelper::getDaemon(),
'cronStatus' => $this->cron_helper->getDaemon(),
'queueStatus' => MailerLog::getMailerLog(),
];
$system_status_data['cronStatus']['accessible'] = CronHelper::isDaemonAccessible();
$system_status_data['cronStatus']['accessible'] = $this->cron_helper->isDaemonAccessible();
$system_status_data['queueStatus']['tasksStatusCounts'] = $this->tasks_state->getCountsPerStatus();
$system_status_data['queueStatus']['latestTasks'] = $this->tasks_state->getLatestTasks(Sending::TASK_TYPE);
$this->page_renderer->displayPage(