upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

fix(BackgroundJobs): Adjust intervals and time sensitivities

Browse source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin 2024-10-07 17:36:55 +02:00
parent d7aff6c150
commit 54ec472d9a
No known key found for this signature in database
26 changed files with 36 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
View file

@ -10,7 +10,6 @@ namespace OCA\ContactsInteraction\BackgroundJob;
use OCA\ContactsInteraction\Db\RecentContactMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
class CleanupJob extends TimedJob {
@ -22,7 +21,7 @@ class CleanupJob extends TimedJob {
parent::__construct($time);
$this->setInterval(24 * 60 * 60);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}

3
apps/dav/lib/BackgroundJob/UploadCleanup.php
View file

@ -10,7 +10,6 @@ namespace OCA\DAV\BackgroundJob;
use OC\User\NoUserException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\TimedJob;
use OCP\Files\File;
@ -32,7 +31,7 @@ class UploadCleanup extends TimedJob {
// Run once a day
$this->setInterval(60 * 60 * 24);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
protected function run($argument) {

1
apps/federation/lib/SyncJob.php
View file

@ -19,6 +19,7 @@ class SyncJob extends TimedJob {
parent::__construct($timeFactory);
// Run once a day
$this->setInterval(24 * 60 * 60);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
$this->syncService = $syncService;
$this->logger = $logger;
}

4
apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php
View file

@ -13,14 +13,12 @@ use OCP\BackgroundJob\TimedJob;
use OCP\DirectEditing\IManager;
class CleanupDirectEditingTokens extends TimedJob {
private const INTERVAL_MINUTES = 15 * 60;
private IManager $manager;
public function __construct(ITimeFactory $time,
IManager $manager) {
parent::__construct($time);
$this->interval = self::INTERVAL_MINUTES;
$this->setInterval(15 * 60);
$this->manager = $manager;
}

10
apps/files/lib/BackgroundJob/CleanupFileLocks.php
View file

@ -15,20 +15,12 @@ use OCP\BackgroundJob\TimedJob;
* Clean up all file locks that are expired for the DB file locking provider
*/
class CleanupFileLocks extends TimedJob {
/**
* Default interval in minutes
*
* @var int $defaultIntervalMin
**/
protected $defaultIntervalMin = 5;
/**
* sets the correct interval for this timed job
*/
public function __construct(ITimeFactory $time) {
parent::__construct($time);
$this->interval = $this->defaultIntervalMin * 60;
$this->setInterval(5 * 60);
}
/**

3
apps/files/lib/BackgroundJob/DeleteExpiredOpenLocalEditor.php
View file

@ -11,7 +11,6 @@ namespace OCA\Files\BackgroundJob;
use OCA\Files\Db\OpenLocalEditorMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
/**
@ -29,7 +28,7 @@ class DeleteExpiredOpenLocalEditor extends TimedJob {
// Run every 12h
$this->interval = 12 * 3600;
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
/**

3
apps/files/lib/BackgroundJob/DeleteOrphanedItems.php
View file

@ -18,7 +18,6 @@ use Psr\Log\LoggerInterface;
*/
class DeleteOrphanedItems extends TimedJob {
public const CHUNK_SIZE = 200;
protected $defaultIntervalMin = 60;
/**
* sets the correct interval for this timed job
@ -29,7 +28,7 @@ class DeleteOrphanedItems extends TimedJob {
protected LoggerInterface $logger,
) {
parent::__construct($time);
$this->interval = $this->defaultIntervalMin * 60;
$this->setInterval(60 * 60);
}
/**

3
apps/files_external/lib/BackgroundJob/CredentialsCleanup.php
View file

@ -12,7 +12,6 @@ use OCA\Files_External\Lib\Auth\Password\LoginCredentials;
use OCA\Files_External\Lib\StorageConfig;
use OCA\Files_External\Service\UserGlobalStoragesService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
use OCP\IUser;
use OCP\IUserManager;
@ -37,7 +36,7 @@ class CredentialsCleanup extends TimedJob {
// run every day
$this->setInterval(24 * 60 * 60);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
protected function run($argument) {

3
apps/files_reminders/lib/BackgroundJob/CleanUpReminders.php
View file

@ -11,7 +11,6 @@ namespace OCA\FilesReminders\BackgroundJob;
use OCA\FilesReminders\Service\ReminderService;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
class CleanUpReminders extends TimedJob {
@ -22,7 +21,7 @@ class CleanUpReminders extends TimedJob {
parent::__construct($time);
$this->setInterval(24 * 60 * 60); // 1 day
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
/**

3
apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php
View file

@ -26,7 +26,8 @@ class FederatedSharesDiscoverJob extends TimedJob {
private LoggerInterface $logger,
) {
parent::__construct($time);
$this->setInterval(86400);
$this->setInterval(24 * 60 * 60);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
public function run($argument) {

3
apps/files_sharing/lib/ExpireSharesJob.php
View file

@ -7,7 +7,6 @@
namespace OCA\Files_Sharing;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
use OCP\IDBConnection;
use OCP\Share\Exceptions\ShareNotFound;
@ -33,7 +32,7 @@ class ExpireSharesJob extends TimedJob {
// Run once a day
$this->setInterval(24 * 60 * 60);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}

4
apps/files_sharing/lib/SharesReminderJob.php
View file

@ -33,7 +33,7 @@ use Psr\Log\LoggerInterface;
* Send a reminder via email to the sharee(s) if the folder is still empty a predefined time before the expiration date
*/
class SharesReminderJob extends TimedJob {
private const SECONDS_BEFORE_REMINDER = 86400;
private const SECONDS_BEFORE_REMINDER = 24 * 60 * 60;
private const CHUNK_SIZE = 1000;
private int $folderMimeTypeId;
@ -50,7 +50,7 @@ class SharesReminderJob extends TimedJob {
IMimeTypeLoader $mimeTypeLoader,
) {
parent::__construct($time);
$this->setInterval(3600);
$this->setInterval(60 * 60);
$this->folderMimeTypeId = $mimeTypeLoader->getId(ICacheEntry::DIRECTORY_MIMETYPE);
}

3
apps/oauth2/lib/BackgroundJob/CleanupExpiredAuthorizationCode.php
View file

@ -12,7 +12,6 @@ namespace OCA\OAuth2\BackgroundJob;
use OCA\OAuth2\Db\AccessTokenMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
use OCP\DB\Exception;
use Psr\Log\LoggerInterface;
@ -27,7 +26,7 @@ class CleanupExpiredAuthorizationCode extends TimedJob {
parent::__construct($timeFactory);
// 30 days
$this->setInterval(60 * 60 * 24 * 30);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
/**

3
apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php
View file

@ -10,7 +10,6 @@ namespace OCA\TwoFactorBackupCodes\BackgroundJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\TimedJob;
use OCP\IUserManager;
@ -43,7 +42,7 @@ class RememberBackupCodesJob extends TimedJob {
$this->jobList = $jobList;
$this->setInterval(60 * 60 * 24 * 14);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
protected function run($argument) {

1
apps/updatenotification/lib/BackgroundJob/UpdateAvailableNotifications.php
View file

@ -40,6 +40,7 @@ class UpdateAvailableNotifications extends TimedJob {
parent::__construct($timeFactory);
// Run once a day
$this->setInterval(60 * 60 * 24);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
protected function run($argument) {

2
apps/user_ldap/lib/Jobs/CleanUp.php
View file

@ -27,7 +27,7 @@ class CleanUp extends TimedJob {
protected $limit;
/** @var int $defaultIntervalMin default interval in minutes */
protected $defaultIntervalMin = 51;
protected $defaultIntervalMin = 60;
/** @var User_LDAP|User_Proxy $userBackend */
protected $userBackend;

2
apps/user_status/lib/BackgroundJob/ClearOldStatusesBackgroundJob.php
View file

@ -35,7 +35,7 @@ class ClearOldStatusesBackgroundJob extends TimedJob {
$this->mapper = $mapper;
// Run every time the cron is run
$this->setInterval(60);
$this->setInterval(0);
}
/**

2
core/BackgroundJobs/CleanupLoginFlowV2.php
View file

@ -19,7 +19,7 @@ class CleanupLoginFlowV2 extends TimedJob {
) {
parent::__construct($time);
$this->setInterval(3600);
$this->setInterval(60 * 60);
}
protected function run($argument): void {

4
core/BackgroundJobs/GenerateMetadataJob.php
View file

@ -36,8 +36,8 @@ class GenerateMetadataJob extends TimedJob {
) {
parent::__construct($time);
$this->setTimeSensitivity(\OCP\BackgroundJob\IJob::TIME_INSENSITIVE);
$this->setInterval(24 * 3600);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
$this->setInterval(24 * 60 * 60);
}
protected function run(mixed $argument): void {

3
lib/private/Preview/BackgroundCleanupJob.php
View file

@ -37,7 +37,8 @@ class BackgroundCleanupJob extends TimedJob {
bool $isCLI) {
parent::__construct($timeFactory);
// Run at most once an hour
$this->setInterval(3600);
$this->setInterval(60 * 60);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
$this->connection = $connection;
$this->previewFolder = $previewFolder;

5
lib/private/Security/Bruteforce/CleanupJob.php
View file

@ -9,7 +9,6 @@ declare(strict_types=1);
namespace OC\Security\Bruteforce;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
@ -22,8 +21,8 @@ class CleanupJob extends TimedJob {
parent::__construct($time);
// Run once a day
$this->setInterval(3600 * 24);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setInterval(60 * 60 * 24);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
protected function run($argument): void {

4
lib/private/TaskProcessing/RemoveOldTasksBackgroundJob.php
View file

@ -16,7 +16,7 @@ use OCP\Files\SimpleFS\ISimpleFolder;
use Psr\Log\LoggerInterface;
class RemoveOldTasksBackgroundJob extends TimedJob {
public const MAX_TASK_AGE_SECONDS = 60 * 50 * 24 * 7 * 4; // 4 weeks
public const MAX_TASK_AGE_SECONDS = 60 * 60 * 24 * 7 * 4; // 4 weeks
private \OCP\Files\IAppData $appData;
public function __construct(
@ -28,7 +28,7 @@ class RemoveOldTasksBackgroundJob extends TimedJob {
parent::__construct($timeFactory);
$this->setInterval(60 * 60 * 24);
// can be deferred to maintenance window
$this->setTimeSensitivity(TimedJob::TIME_INSENSITIVE);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
$this->appData = $appDataFactory->get('core');
}

3
lib/private/TextProcessing/RemoveOldTasksBackgroundJob.php
View file

@ -17,7 +17,7 @@ use OCP\DB\Exception;
use Psr\Log\LoggerInterface;
class RemoveOldTasksBackgroundJob extends TimedJob {
public const MAX_TASK_AGE_SECONDS = 60 * 50 * 24 * 7; // 1 week
public const MAX_TASK_AGE_SECONDS = 60 * 60 * 24 * 7; // 1 week
public function __construct(
ITimeFactory $timeFactory,
@ -26,6 +26,7 @@ class RemoveOldTasksBackgroundJob extends TimedJob {
) {
parent::__construct($timeFactory);
$this->setInterval(60 * 60 * 24);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
/**

3
lib/private/TextToImage/RemoveOldTasksBackgroundJob.php
View file

@ -21,7 +21,7 @@ use OCP\Files\NotPermittedException;
use Psr\Log\LoggerInterface;
class RemoveOldTasksBackgroundJob extends TimedJob {
public const MAX_TASK_AGE_SECONDS = 60 * 50 * 24 * 7; // 1 week
public const MAX_TASK_AGE_SECONDS = 60 * 60 * 24 * 7; // 1 week
private IAppData $appData;
@ -34,6 +34,7 @@ class RemoveOldTasksBackgroundJob extends TimedJob {
parent::__construct($timeFactory);
$this->appData = $appDataFactory->get('core');
$this->setInterval(60 * 60 * 24);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
}
/**

5
lib/private/User/BackgroundJobs/CleanupDeletedUsers.php
View file

@ -12,7 +12,6 @@ use OC\User\Manager;
use OC\User\PartiallyDeletedUsersBackend;
use OC\User\User;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\IJob;
use OCP\BackgroundJob\TimedJob;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
@ -26,8 +25,8 @@ class CleanupDeletedUsers extends TimedJob {
private LoggerInterface $logger,
) {
parent::__construct($time);
$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
$this->setInterval(24 * 3600);
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
$this->setInterval(24 * 60 * 60);
}
protected function run($argument): void {

4
lib/public/BackgroundJob/TimedJob.php
View file

@ -52,8 +52,8 @@ abstract class TimedJob extends Job {
* @since 24.0.0
*/
public function setTimeSensitivity(int $sensitivity): void {
if ($sensitivity !== IJob::TIME_SENSITIVE &&
$sensitivity !== IJob::TIME_INSENSITIVE) {
if ($sensitivity !== self::TIME_SENSITIVE &&
$sensitivity !== self::TIME_INSENSITIVE) {
throw new \InvalidArgumentException('Invalid sensitivity');
}