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

- Fixes API endpoint naming convention

Browse Source 
- Generates/saves cron daemon token as soon as its executed
This commit is contained in:
Vlad
2016-07-07 14:00:07 -04:00
parent 1cd9f3eb67
commit 150364de3a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/API/API.php
View File

@ -34,13 +34,14 @@ class API {
$this->terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API endpoint.')); $this->terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API endpoint.'));
} }
$this->callEndpoint( $this->callEndpoint(
self::ENDPOINT_NAMESPACE . $this->endpoint, $this->endpoint,
$this->action, $this->action,
$this->data $this->data
); );
} }
function callEndpoint($endpoint, $action, $data) { function callEndpoint($endpoint, $action, $data) {
$endpoint = self::ENDPOINT_NAMESPACE . ucfirst($endpoint);
if(!method_exists($endpoint, $action)) { if(!method_exists($endpoint, $action)) {
$this->terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API action.')); $this->terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API action.'));
} }

6
lib/Cron/Daemon.php
View File

@ -30,7 +30,6 @@ class Daemon {
function run() { function run() {
$daemon = $this->daemon; $daemon = $this->daemon;
set_time_limit(0);
if(!$daemon) { if(!$daemon) {
$this->abortWithError(__('Daemon does not exist.')); $this->abortWithError(__('Daemon does not exist.'));
} }
@ -39,6 +38,8 @@ class Daemon {
) { ) {
$this->abortWithError(__('Invalid or missing token.')); $this->abortWithError(__('Invalid or missing token.'));
} }
$daemon['token'] = $this->token;
CronHelper::saveDaemon($daemon);
$this->abortIfStopped($daemon); $this->abortIfStopped($daemon);
try { try {
$scheduler = new SchedulerWorker($this->timer); $scheduler = new SchedulerWorker($this->timer);
@ -55,14 +56,13 @@ class Daemon {
// after each execution, re-read daemon data in case its status was changed // after each execution, re-read daemon data in case its status was changed
// its status has changed // its status has changed
$daemon = CronHelper::getDaemon(); $daemon = CronHelper::getDaemon();
if(!$daemon || $daemon['token'] !== $this->data['token']) { if(!$daemon || $daemon['token'] !== $this->token) {
$this->terminateRequest(); $this->terminateRequest();
} }
$this->abortIfStopped($daemon); $this->abortIfStopped($daemon);
if($daemon['status'] === self::STATUS_STARTING) { if($daemon['status'] === self::STATUS_STARTING) {
$daemon['status'] = self::STATUS_STARTED; $daemon['status'] = self::STATUS_STARTED;
} }
$daemon['token'] = $this->token;
CronHelper::saveDaemon($daemon); CronHelper::saveDaemon($daemon);
$this->callSelf(); $this->callSelf();
} }