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

- Refactors some code

Browse Source
This commit is contained in:
MrCasual
2015-11-23 17:45:00 -05:00
parent 68f747211a
commit 18518de397
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Queue/Daemon.php
View File

@@ -35,8 +35,8 @@ class Daemon {
$queueData = array( $queueData = array(
'status' => 'started', 'status' => 'started',
'token' => $this->refreshedToken, 'token' => $this->refreshedToken,
'executionCounter' => ($queueData['status'] === 'paused') ? 'counter' => ($queueData['status'] === 'paused') ?
$queueData['executionCounter'] $queueData['counter']
: 0 : 0
); );
$_SESSION['queue'] = array('result' => true); $_SESSION['queue'] = array('result' => true);
@@ -69,9 +69,9 @@ class Daemon {
*/ */
sleep(30); sleep(30);
// after each execution, read queue in case its status was modified // after each execution, read queue in case it's status was modified
list($queue, $queueData) = $this->getQueue(); list($queue, $queueData) = $this->getQueue();
$queueData['executionCounter']++; $queueData['counter']++;
$queueData['token'] = $this->refreshedToken; $queueData['token'] = $this->refreshedToken;
$queue->value = serialize($queueData); $queue->value = serialize($queueData);
$queue->save(); $queue->save();
@@ -108,14 +108,9 @@ class Daemon {
function callSelf() { function callSelf() {
$payload = json_encode(array('token' => $this->refreshedToken)); $payload = json_encode(array('token' => $this->refreshedToken));
$args = array( Supervisor::getRemoteUrl(
'timeout' => 1, '/?mailpoet-api&section=queue&action=run&payload=' . urlencode($payload)
'user-agent' => 'MailPoet (www.mailpoet.com)'
);
wp_remote_get(
Supervisor::getSiteUrl() .
'/?mailpoet-api&section=queue&action=run&payload=' . urlencode($payload),
$args
); );
exit; exit;
} }

29
lib/Queue/Supervisor.php
View File

@@ -44,20 +44,10 @@ class Supervisor {
if(!session_id()) session_start(); if(!session_id()) session_start();
$sessionId = session_id(); $sessionId = session_id();
session_write_close(); session_write_close();
$args = array( $_SESSION['queue'] = null;
'timeout' => 1, $payload = json_encode(array('session' => $sessionId));
'user-agent' => 'MailPoet (www.mailpoet.com)' self::getRemoteUrl(
); '/?mailpoet-api&section=queue&action=start&payload=' . urlencode($payload)
$payload = json_encode(
array(
'session' => $sessionId
)
);
wp_remote_get(
self::getSiteUrl() .
'/?mailpoet-api&section=queue&action=start&payload=' .
urlencode($payload),
$args
); );
session_start(); session_start();
$queueStatus = $_SESSION['queue']; $queueStatus = $_SESSION['queue'];
@@ -76,6 +66,17 @@ class Supervisor {
); );
} }
static function getRemoteUrl($url) {
$args = array(
'timeout' => 1,
'user-agent' => 'MailPoet (www.mailpoet.com)'
);
wp_remote_get(
self::getSiteUrl() . $url,
$args
);
}
static function getSiteUrl() { static function getSiteUrl() {
if(preg_match('!:\d+/!', site_url())) return site_url(); if(preg_match('!:\d+/!', site_url())) return site_url();
preg_match('!http://(?P<host>.*?):(?P<port>\d+)!', site_url(), $server); preg_match('!http://(?P<host>.*?):(?P<port>\d+)!', site_url(), $server);