upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #59934 from nextcloud/feat/prevent-pending-trx-cron

Browse source 
feat(cron): prevent pending transactions forgotten by a job
This commit is contained in:
Côme Chilliet 2026-04-30 18:26:17 +02:00 committed by GitHub
commit 5b7cd417e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/Service/CronService.php
View file

@ -13,6 +13,7 @@ namespace OC\Core\Service;
use OC;
use OC\Authentication\LoginCredentials\Store;
use OC\DB\Connection;
use OC\Security\CSRF\TokenStorage\SessionStorage;
use OC\Session\CryptoWrapper;
use OC\Session\Memory;
@ -38,6 +39,7 @@ class CronService {
private readonly IAppManager $appManager,
private readonly ISession $session,
private readonly Session $userSession,
private readonly Connection $connection,
private readonly CryptoWrapper $cryptoWrapper,
private readonly Store $store,
private readonly SessionStorage $sessionStorage,
@ -210,6 +212,12 @@ class CronService {
// clean up after unclean jobs
$this->setupManager->tearDown();
$this->tempManager->clean();
if ($this->connection->inTransaction()) {
$this->connection->rollBack();
$message = 'Cron job left a transaction opened after executing job ' . $jobDetails . '. The transaction was rolled back.';
$this->logger->warning($message, ['app' => 'cron']);
$this->verboseOutput($message);
}
$this->verboseOutput('Job ' . $jobDetails . ' done in ' . ($timeAfter - $timeBefore) . ' seconds');