- Updates cron API URL

- Removes cron daemon counter
- Generates/saves cron daemon token as soon as its executed
This commit is contained in:
Vlad
2016-07-06 19:45:13 -04:00
parent bd814baf28
commit ab33a9c352
2 changed files with 4 additions and 7 deletions

View File

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