diff --git a/lib/Cron/CronHelper.php b/lib/Cron/CronHelper.php index 4ccf9fd436..0c9f1ade0b 100644 --- a/lib/Cron/CronHelper.php +++ b/lib/Cron/CronHelper.php @@ -11,7 +11,7 @@ if(!defined('ABSPATH')) exit; class CronHelper { const DAEMON_EXECUTION_LIMIT = 20; const DAEMON_EXECUTION_TIMEOUT = 35; - const DAEMON_REQUEST_TIMEOUT = 5; + const DAEMON_REQUEST_TIMEOUT = 2; const DAEMON_SETTING = 'cron_daemon'; static function createOrRestartDaemon($token) { @@ -49,7 +49,7 @@ class CronHelper { return Security::generateRandomString(); } - static function accessDaemon($token) { + static function accessDaemon($token, $timeout = self::DAEMON_REQUEST_TIMEOUT) { $data = array('token' => $token); $url = FrontRouter::buildRequest( QueueEndpoint::ENDPOINT, @@ -59,7 +59,7 @@ class CronHelper { $args = array( 'blocking' => false, 'sslverify' => false, - 'timeout' => self::DAEMON_REQUEST_TIMEOUT, + 'timeout' => $timeout, 'user-agent' => 'MailPoet (www.mailpoet.com) Cron' ); $result = wp_remote_get($url, $args); diff --git a/lib/Cron/Daemon.php b/lib/Cron/Daemon.php index 2fe7f9d4dc..aaeada8b45 100644 --- a/lib/Cron/Daemon.php +++ b/lib/Cron/Daemon.php @@ -16,6 +16,7 @@ class Daemon { const STATUS_STOPPING = 'stopping'; const STATUS_STARTED = 'started'; const STATUS_STARTING = 'starting'; + const REQUEST_TIMEOUT = 5; private $timer; function __construct($data) { @@ -78,7 +79,7 @@ class Daemon { } function callSelf() { - CronHelper::accessDaemon($this->token); + CronHelper::accessDaemon($this->token, self::REQUEST_TIMEOUT); $this->terminateRequest(); }