Skip to content

set changed status on model to prevent status overwriting when model gets saved #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

set changed status on model to prevent status overwriting when model gets saved #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fc03ac
set changed status on model to prevent status overwriting when model …
May 29, 2014
4678e58
remove obsolete setting of status as it's now fixed in the model
May 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions app/code/Magento/Cron/Model/Observer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
);
}

/**
* though running status is set in tryLockJob we must set it here because the object
* was loaded with a pending status and will set it back to pending if we don't set it here
*/
$schedule->setStatus(Schedule::STATUS_RUNNING)->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))->save();
$schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))->save();

call_user_func_array($callback, array($schedule));

Expand Down
8 changes: 6 additions & 2 deletions app/code/Magento/Cron/Model/Schedule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,14 @@ public function getNumeric($value)
*/
public function tryLockJob()
{
return $this->_getResource()->trySetJobStatusAtomic(
if ($this->_getResource()->trySetJobStatusAtomic(
$this->getId(),
self::STATUS_RUNNING,
self::STATUS_PENDING
);
)) {
$this->setStatus(self::STATUS_RUNNING);
return true;
}
return false;
}
}