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

- Updates daemon request timeouts

Browse Source
This commit is contained in:
Vlad
2016-07-26 10:53:20 -04:00
parent 0b0c0f5759
commit 1be7fda1cf
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Cron/CronHelper.php
View File

@@ -11,7 +11,7 @@ if(!defined('ABSPATH')) exit;
class CronHelper { class CronHelper {
const DAEMON_EXECUTION_LIMIT = 20; const DAEMON_EXECUTION_LIMIT = 20;
const DAEMON_EXECUTION_TIMEOUT = 35; const DAEMON_EXECUTION_TIMEOUT = 35;
const DAEMON_REQUEST_TIMEOUT = 5; const DAEMON_REQUEST_TIMEOUT = 2;
const DAEMON_SETTING = 'cron_daemon'; const DAEMON_SETTING = 'cron_daemon';
static function createOrRestartDaemon($token) { static function createOrRestartDaemon($token) {
@@ -49,7 +49,7 @@ class CronHelper {
return Security::generateRandomString(); return Security::generateRandomString();
} }
static function accessDaemon($token) { static function accessDaemon($token, $timeout = self::DAEMON_REQUEST_TIMEOUT) {
$data = array('token' => $token); $data = array('token' => $token);
$url = FrontRouter::buildRequest( $url = FrontRouter::buildRequest(
QueueEndpoint::ENDPOINT, QueueEndpoint::ENDPOINT,
@@ -59,7 +59,7 @@ class CronHelper {
$args = array( $args = array(
'blocking' => false, 'blocking' => false,
'sslverify' => false, 'sslverify' => false,
'timeout' => self::DAEMON_REQUEST_TIMEOUT, 'timeout' => $timeout,
'user-agent' => 'MailPoet (www.mailpoet.com) Cron' 'user-agent' => 'MailPoet (www.mailpoet.com) Cron'
); );
$result = wp_remote_get($url, $args); $result = wp_remote_get($url, $args);

3
lib/Cron/Daemon.php
View File

@@ -16,6 +16,7 @@ class Daemon {
const STATUS_STOPPING = 'stopping'; const STATUS_STOPPING = 'stopping';
const STATUS_STARTED = 'started'; const STATUS_STARTED = 'started';
const STATUS_STARTING = 'starting'; const STATUS_STARTING = 'starting';
const REQUEST_TIMEOUT = 5;
private $timer; private $timer;
function __construct($data) { function __construct($data) {
@@ -78,7 +79,7 @@ class Daemon {
} }
function callSelf() { function callSelf() {
CronHelper::accessDaemon($this->token); CronHelper::accessDaemon($this->token, self::REQUEST_TIMEOUT);
$this->terminateRequest(); $this->terminateRequest();
} }