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

- Removes depreciated variables

Browse Source 
- Updates method names
This commit is contained in:
Vlad
2016-08-08 09:29:00 -04:00
parent 983d56c29b
commit 7ff036b1e9
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Cron/CronHelper.php
View File

@@ -1,9 +1,9 @@
<?php <?php
namespace MailPoet\Cron; namespace MailPoet\Cron;
use MailPoet\Router\Front as FrontRouter;
use MailPoet\Router\Endpoints\Queue as QueueEndpoint;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
use MailPoet\Router\Endpoints\Queue as QueueEndpoint;
use MailPoet\Router\Front as FrontRouter;
use MailPoet\Util\Security; use MailPoet\Util\Security;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
@@ -14,7 +14,7 @@ class CronHelper {
const DAEMON_REQUEST_TIMEOUT = 2; const DAEMON_REQUEST_TIMEOUT = 2;
const DAEMON_SETTING = 'cron_daemon'; const DAEMON_SETTING = 'cron_daemon';
static function createOrRestartDaemon($token) { static function createDaemon($token) {
$daemon = array( $daemon = array(
'status' => Daemon::STATUS_STARTING, 'status' => Daemon::STATUS_STARTING,
'token' => $token 'token' => $token
@@ -23,6 +23,10 @@ class CronHelper {
return $daemon; return $daemon;
} }
static function restartDaemon($token) {
return self::createDaemon($token);
}
static function getDaemon() { static function getDaemon() {
return Setting::getValue(self::DAEMON_SETTING); return Setting::getValue(self::DAEMON_SETTING);
} }

24
lib/Cron/Supervisor.php
View File

@@ -6,21 +6,18 @@ if(!defined('ABSPATH')) exit;
class Supervisor { class Supervisor {
public $daemon; public $daemon;
public $token; public $token;
public $force_run;
function __construct($force_run = false) { function __construct() {
$this->daemon = CronHelper::getDaemon();
$this->token = CronHelper::createToken(); $this->token = CronHelper::createToken();
$this->force_run = $force_run; $this->daemon = $this->getDaemon();
} }
function checkDaemon() { function checkDaemon() {
$daemon = $this->daemon; $daemon = $this->daemon;
$execution_timeout_exceeded = ($daemon) ? $execution_timeout_exceeded =
(time() - (int)$daemon['updated_at']) > CronHelper::DAEMON_EXECUTION_TIMEOUT : (time() - (int)$daemon['updated_at']) > CronHelper::DAEMON_EXECUTION_TIMEOUT;
false; if($execution_timeout_exceeded) {
if(!$daemon || $execution_timeout_exceeded) { CronHelper::restartDaemon($this->token);
CronHelper::createOrRestartDaemon($this->token);
return $this->runDaemon(); return $this->runDaemon();
} }
return $daemon; return $daemon;
@@ -31,4 +28,13 @@ class Supervisor {
$daemon = CronHelper::getDaemon(); $daemon = CronHelper::getDaemon();
return $daemon; return $daemon;
} }
function getDaemon() {
$daemon = CronHelper::getDaemon();
if(!$daemon) {
CronHelper::createDaemon($this->token);
return $this->runDaemon();
}
return $daemon;
}
} }