nextcloud / server

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +55 added lines, -55 removed lines

@@ -37,71 +37,71 @@
  */
 class ExpireSharesJob extends TimedJob {
 
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	public function __construct(ITimeFactory $time, IManager $shareManager, IDBConnection $db) {
-		$this->shareManager = $shareManager;
-		$this->db = $db;
+    public function __construct(ITimeFactory $time, IManager $shareManager, IDBConnection $db) {
+        $this->shareManager = $shareManager;
+        $this->db = $db;
 
-		parent::__construct($time);
+        parent::__construct($time);
 
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
-	}
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+    }
 
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'share_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->orX(
-						$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
-						$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
-					),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-						$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-					)
-				)
-			);
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('id', 'share_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
+                        $qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
+                    ),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                    )
+                )
+            );
 
-		$shares = $qb->execute();
-		while ($share = $shares->fetch()) {
-			if ((int)$share['share_type'] === IShare::TYPE_LINK) {
-				$id = 'ocinternal';
-			} elseif ((int)$share['share_type'] === IShare::TYPE_EMAIL) {
-				$id = 'ocMailShare';
-			}
+        $shares = $qb->execute();
+        while ($share = $shares->fetch()) {
+            if ((int)$share['share_type'] === IShare::TYPE_LINK) {
+                $id = 'ocinternal';
+            } elseif ((int)$share['share_type'] === IShare::TYPE_EMAIL) {
+                $id = 'ocMailShare';
+            }
 
-			$id .= ':' . $share['id'];
+            $id .= ':' . $share['id'];
 
-			try {
-				$share = $this->shareManager->getShareById($id);
-				$this->shareManager->deleteShare($share);
-			} catch (ShareNotFound $e) {
-				// Normally the share gets automatically expired on fetching it
-			}
-		}
-		$shares->closeCursor();
-	}
+            try {
+                $share = $this->shareManager->getShareById($id);
+                $this->shareManager->deleteShare($share);
+            } catch (ShareNotFound $e) {
+                // Normally the share gets automatically expired on fetching it
+            }
+        }
+        $shares->closeCursor();
+    }
 }

apps/dav/lib/BackgroundJob/UploadCleanup.php

Indentation +39 added lines, -39 removed lines

@@ -39,53 +39,53 @@
 
 class UploadCleanup extends TimedJob {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(ITimeFactory $time, IRootFolder $rootFolder, IJobList $jobList) {
-		parent::__construct($time);
-		$this->rootFolder = $rootFolder;
-		$this->jobList = $jobList;
+    public function __construct(ITimeFactory $time, IRootFolder $rootFolder, IJobList $jobList) {
+        parent::__construct($time);
+        $this->rootFolder = $rootFolder;
+        $this->jobList = $jobList;
 
-		// Run once a day
-		$this->setInterval(60 * 60 * 24);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
-	}
+        // Run once a day
+        $this->setInterval(60 * 60 * 24);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+    }
 
-	protected function run($argument) {
-		$uid = $argument['uid'];
-		$folder = $argument['folder'];
+    protected function run($argument) {
+        $uid = $argument['uid'];
+        $folder = $argument['folder'];
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($uid);
-			$userRoot = $userFolder->getParent();
-			/** @var Folder $uploads */
-			$uploads = $userRoot->get('uploads');
-			/** @var Folder $uploadFolder */
-			$uploadFolder = $uploads->get($folder);
-		} catch (NotFoundException | NoUserException $e) {
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($uid);
+            $userRoot = $userFolder->getParent();
+            /** @var Folder $uploads */
+            $uploads = $userRoot->get('uploads');
+            /** @var Folder $uploadFolder */
+            $uploadFolder = $uploads->get($folder);
+        } catch (NotFoundException | NoUserException $e) {
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
 
-		$files = $uploadFolder->getDirectoryListing();
+        $files = $uploadFolder->getDirectoryListing();
 
-		// Remove if all files have an mtime of more than a day
-		$time = $this->time->getTime() - 60 * 60 * 24;
+        // Remove if all files have an mtime of more than a day
+        $time = $this->time->getTime() - 60 * 60 * 24;
 
-		// The folder has to be more than a day old
-		$initial = $uploadFolder->getMTime() < $time;
+        // The folder has to be more than a day old
+        $initial = $uploadFolder->getMTime() < $time;
 
-		$expire = array_reduce($files, function (bool $carry, File $file) use ($time) {
-			return $carry && $file->getMTime() < $time;
-		}, $initial);
+        $expire = array_reduce($files, function (bool $carry, File $file) use ($time) {
+            return $carry && $file->getMTime() < $time;
+        }, $initial);
 
-		if ($expire) {
-			$uploadFolder->delete();
-			$this->jobList->remove(self::class, $argument);
-		}
-	}
+        if ($expire) {
+            $uploadFolder->delete();
+            $this->jobList->remove(self::class, $argument);
+        }
+    }
 }

apps/files_external/lib/BackgroundJob/CredentialsCleanup.php

Indentation +28 added lines, -28 removed lines

@@ -36,38 +36,38 @@
 use OCP\IUserManager;
 
 class CredentialsCleanup extends TimedJob {
-	private $credentialsManager;
-	private $userGlobalStoragesService;
-	private $userManager;
+    private $credentialsManager;
+    private $userGlobalStoragesService;
+    private $userManager;
 
-	public function __construct(
-		ITimeFactory $time,
-		ICredentialsManager $credentialsManager,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		IUserManager $userManager
-	) {
-		parent::__construct($time);
+    public function __construct(
+        ITimeFactory $time,
+        ICredentialsManager $credentialsManager,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        IUserManager $userManager
+    ) {
+        parent::__construct($time);
 
-		$this->credentialsManager = $credentialsManager;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->userManager = $userManager;
+        $this->credentialsManager = $credentialsManager;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->userManager = $userManager;
 
-		// run every day
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
-	}
+        // run every day
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+    }
 
-	protected function run($argument) {
-		$this->userManager->callForSeenUsers(function (IUser $user) {
-			$storages = $this->userGlobalStoragesService->getAllStoragesForUser($user);
+    protected function run($argument) {
+        $this->userManager->callForSeenUsers(function (IUser $user) {
+            $storages = $this->userGlobalStoragesService->getAllStoragesForUser($user);
 
-			$usesLoginCredentials = array_reduce($storages, function (bool $uses, StorageConfig $storage) {
-				return $uses || $storage->getAuthMechanism() instanceof LoginCredentials;
-			}, false);
+            $usesLoginCredentials = array_reduce($storages, function (bool $uses, StorageConfig $storage) {
+                return $uses || $storage->getAuthMechanism() instanceof LoginCredentials;
+            }, false);
 
-			if (!$usesLoginCredentials) {
-				$this->credentialsManager->delete($user->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER);
-			}
-		});
-	}
+            if (!$usesLoginCredentials) {
+                $this->credentialsManager->delete($user->getUID(), LoginCredentials::CREDENTIALS_IDENTIFIER);
+            }
+        });
+    }
 }

apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php

Indentation +60 added lines, -60 removed lines

@@ -36,67 +36,67 @@
 
 class RememberBackupCodesJob extends TimedJob {
 
-	/** @var IRegistry */
-	private $registry;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IManager */
-	private $notificationManager;
-
-	/** @var IJobList */
-	private $jobList;
-
-	public function __construct(IRegistry $registry,
-								IUserManager $userManager,
-								ITimeFactory $timeFactory,
-								IManager $notificationManager,
-								IJobList $jobList) {
-		parent::__construct($timeFactory);
-		$this->registry = $registry;
-		$this->userManager = $userManager;
-		$this->time = $timeFactory;
-		$this->notificationManager = $notificationManager;
-		$this->jobList = $jobList;
-
-		$this->setInterval(60 * 60 * 24 * 14);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
-	}
-
-	protected function run($argument) {
-		$uid = $argument['uid'];
-		$user = $this->userManager->get($uid);
-
-		if ($user === null) {
-			// We can't run with an invalid user
-			return;
-		}
-
-		$providers = $this->registry->getProviderStates($user);
-		$state2fa = array_reduce($providers, function (bool $carry, bool $state) {
-			return $carry || $state;
-		}, false);
-
-		/*
+    /** @var IRegistry */
+    private $registry;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IManager */
+    private $notificationManager;
+
+    /** @var IJobList */
+    private $jobList;
+
+    public function __construct(IRegistry $registry,
+                                IUserManager $userManager,
+                                ITimeFactory $timeFactory,
+                                IManager $notificationManager,
+                                IJobList $jobList) {
+        parent::__construct($timeFactory);
+        $this->registry = $registry;
+        $this->userManager = $userManager;
+        $this->time = $timeFactory;
+        $this->notificationManager = $notificationManager;
+        $this->jobList = $jobList;
+
+        $this->setInterval(60 * 60 * 24 * 14);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+    }
+
+    protected function run($argument) {
+        $uid = $argument['uid'];
+        $user = $this->userManager->get($uid);
+
+        if ($user === null) {
+            // We can't run with an invalid user
+            return;
+        }
+
+        $providers = $this->registry->getProviderStates($user);
+        $state2fa = array_reduce($providers, function (bool $carry, bool $state) {
+            return $carry || $state;
+        }, false);
+
+        /*
 		 * If no provider is active or if the backup codes are already generate
 		 * we can remove the job
 		 */
-		if ($state2fa === false || (isset($providers['backup_codes']) && $providers['backup_codes'] === true)) {
-			// Backup codes already generated lets remove this job
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
-
-		$date = new \DateTime();
-		$date->setTimestamp($this->time->getTime());
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('twofactor_backupcodes')
-			->setUser($user->getUID())
-			->setDateTime($date)
-			->setObject('create', 'codes')
-			->setSubject('create_backupcodes');
-		$this->notificationManager->notify($notification);
-	}
+        if ($state2fa === false || (isset($providers['backup_codes']) && $providers['backup_codes'] === true)) {
+            // Backup codes already generated lets remove this job
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
+
+        $date = new \DateTime();
+        $date->setTimestamp($this->time->getTime());
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('twofactor_backupcodes')
+            ->setUser($user->getUID())
+            ->setDateTime($date)
+            ->setObject('create', 'codes')
+            ->setSubject('create_backupcodes');
+        $this->notificationManager->notify($notification);
+    }
 }

apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php

Indentation +14 added lines, -14 removed lines

@@ -32,22 +32,22 @@
 
 class CleanupJob extends TimedJob {
 
-	/** @var RecentContactMapper */
-	private $mapper;
+    /** @var RecentContactMapper */
+    private $mapper;
 
-	public function __construct(ITimeFactory $time,
-								RecentContactMapper $mapper) {
-		parent::__construct($time);
+    public function __construct(ITimeFactory $time,
+                                RecentContactMapper $mapper) {
+        parent::__construct($time);
 
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
 
-		$this->mapper = $mapper;
-	}
+        $this->mapper = $mapper;
+    }
 
-	protected function run($argument) {
-		$time = $this->time->getDateTime();
-		$time->modify('-7days');
-		$this->mapper->cleanUp($time->getTimestamp());
-	}
+    protected function run($argument) {
+        $time = $this->time->getDateTime();
+        $time->modify('-7days');
+        $this->mapper->cleanUp($time->getTimestamp());
+    }
 }

cron.php

Indentation +145 added lines, -145 removed lines

@@ -40,151 +40,151 @@
 require_once __DIR__ . '/lib/versioncheck.php';
 
 try {
-	require_once __DIR__ . '/lib/base.php';
-
-	if (\OCP\Util::needUpgrade()) {
-		\OC::$server->getLogger()->debug('Update required, skipping cron', ['app' => 'cron']);
-		exit;
-	}
-	if ((bool) \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-		\OC::$server->getLogger()->debug('We are in maintenance mode, skipping cron', ['app' => 'cron']);
-		exit;
-	}
-
-	// load all apps to get all api routes properly setup
-	OC_App::loadApps();
-
-	\OC::$server->getSession()->close();
-
-	// initialize a dummy memory session
-	$session = new \OC\Session\Memory('');
-	$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
-	$session = $cryptoWrapper->wrapSession($session);
-	\OC::$server->setSession($session);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-
-	// Don't do anything if Nextcloud has not been installed
-	if (!$config->getSystemValue('installed', false)) {
-		exit(0);
-	}
-
-	\OC::$server->getTempManager()->cleanOld();
-
-	// Exit if background jobs are disabled!
-	$appMode = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax');
-	if ($appMode === 'none') {
-		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
-		} else {
-			OC_JSON::error(['data' => ['message' => 'Background jobs disabled!']]);
-		}
-		exit(1);
-	}
-
-	if (OC::$CLI) {
-		// set to run indefinitely if needed
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(0);
-		}
-
-		// the cron job must be executed with the right user
-		if (!function_exists('posix_getuid')) {
-			echo "The posix extensions are required - see https://www.php.net/manual/en/book.posix.php" . PHP_EOL;
-			exit(1);
-		}
-
-		$user = posix_getuid();
-		$configUser = fileowner(OC::$configDir . 'config.php');
-		if ($user !== $configUser) {
-			echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
-			echo "Current user id: " . $user . PHP_EOL;
-			echo "Owner id of config.php: " . $configUser . PHP_EOL;
-			exit(1);
-		}
-
-
-		// We call Nextcloud from the CLI (aka cron)
-		if ($appMode !== 'cron') {
-			$config->setAppValue('core', 'backgroundjobs_mode', 'cron');
-		}
-
-		// Low-load hours
-		$onlyTimeSensitive = false;
-		$startHour = $config->getSystemValueInt('maintenance_window_start', 100);
-		if ($startHour <= 23) {
-			$date = new \DateTime('now', new \DateTimeZone('UTC'));
-			$currentHour = (int) $date->format('G');
-			$endHour = $startHour + 4;
-
-			if ($startHour <= 20) {
-				// Start time: 01:00
-				// End time: 05:00
-				// Only run sensitive tasks when it's before the start or after the end
-				$onlyTimeSensitive = $currentHour < $startHour || $currentHour > $endHour;
-			} else {
-				// Start time: 23:00
-				// End time: 03:00
-				$endHour -= 24; // Correct the end time from 27:00 to 03:00
-				// Only run sensitive tasks when it's after the end and before the start
-				$onlyTimeSensitive = $currentHour > $endHour && $currentHour < $startHour;
-			}
-		}
-
-		// Work
-		$jobList = \OC::$server->getJobList();
-
-		// We only ask for jobs for 14 minutes, because after 5 minutes the next
-		// system cron task should spawn and we want to have at most three
-		// cron jobs running in parallel.
-		$endTime = time() + 14 * 60;
-
-		$executedJobs = [];
-		while ($job = $jobList->getNext($onlyTimeSensitive)) {
-			if (isset($executedJobs[$job->getId()])) {
-				$jobList->unlockJob($job);
-				break;
-			}
-
-			$job->execute($jobList, $logger);
-			// clean up after unclean jobs
-			\OC_Util::tearDownFS();
-
-			$jobList->setLastJob($job);
-			$executedJobs[$job->getId()] = true;
-			unset($job);
-
-			if (time() > $endTime) {
-				break;
-			}
-		}
-	} else {
-		// We call cron.php from some website
-		if ($appMode === 'cron') {
-			// Cron is cron :-P
-			OC_JSON::error(['data' => ['message' => 'Backgroundjobs are using system cron!']]);
-		} else {
-			// Work and success :-)
-			$jobList = \OC::$server->getJobList();
-			$job = $jobList->getNext();
-			if ($job != null) {
-				$job->execute($jobList, $logger);
-				$jobList->setLastJob($job);
-			}
-			OC_JSON::success();
-		}
-	}
-
-	// Log the successful cron execution
-	$config->setAppValue('core', 'lastcron', time());
-	exit();
+    require_once __DIR__ . '/lib/base.php';
+
+    if (\OCP\Util::needUpgrade()) {
+        \OC::$server->getLogger()->debug('Update required, skipping cron', ['app' => 'cron']);
+        exit;
+    }
+    if ((bool) \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
+        \OC::$server->getLogger()->debug('We are in maintenance mode, skipping cron', ['app' => 'cron']);
+        exit;
+    }
+
+    // load all apps to get all api routes properly setup
+    OC_App::loadApps();
+
+    \OC::$server->getSession()->close();
+
+    // initialize a dummy memory session
+    $session = new \OC\Session\Memory('');
+    $cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+    $session = $cryptoWrapper->wrapSession($session);
+    \OC::$server->setSession($session);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+
+    // Don't do anything if Nextcloud has not been installed
+    if (!$config->getSystemValue('installed', false)) {
+        exit(0);
+    }
+
+    \OC::$server->getTempManager()->cleanOld();
+
+    // Exit if background jobs are disabled!
+    $appMode = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax');
+    if ($appMode === 'none') {
+        if (OC::$CLI) {
+            echo 'Background Jobs are disabled!' . PHP_EOL;
+        } else {
+            OC_JSON::error(['data' => ['message' => 'Background jobs disabled!']]);
+        }
+        exit(1);
+    }
+
+    if (OC::$CLI) {
+        // set to run indefinitely if needed
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(0);
+        }
+
+        // the cron job must be executed with the right user
+        if (!function_exists('posix_getuid')) {
+            echo "The posix extensions are required - see https://www.php.net/manual/en/book.posix.php" . PHP_EOL;
+            exit(1);
+        }
+
+        $user = posix_getuid();
+        $configUser = fileowner(OC::$configDir . 'config.php');
+        if ($user !== $configUser) {
+            echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
+            echo "Current user id: " . $user . PHP_EOL;
+            echo "Owner id of config.php: " . $configUser . PHP_EOL;
+            exit(1);
+        }
+
+
+        // We call Nextcloud from the CLI (aka cron)
+        if ($appMode !== 'cron') {
+            $config->setAppValue('core', 'backgroundjobs_mode', 'cron');
+        }
+
+        // Low-load hours
+        $onlyTimeSensitive = false;
+        $startHour = $config->getSystemValueInt('maintenance_window_start', 100);
+        if ($startHour <= 23) {
+            $date = new \DateTime('now', new \DateTimeZone('UTC'));
+            $currentHour = (int) $date->format('G');
+            $endHour = $startHour + 4;
+
+            if ($startHour <= 20) {
+                // Start time: 01:00
+                // End time: 05:00
+                // Only run sensitive tasks when it's before the start or after the end
+                $onlyTimeSensitive = $currentHour < $startHour || $currentHour > $endHour;
+            } else {
+                // Start time: 23:00
+                // End time: 03:00
+                $endHour -= 24; // Correct the end time from 27:00 to 03:00
+                // Only run sensitive tasks when it's after the end and before the start
+                $onlyTimeSensitive = $currentHour > $endHour && $currentHour < $startHour;
+            }
+        }
+
+        // Work
+        $jobList = \OC::$server->getJobList();
+
+        // We only ask for jobs for 14 minutes, because after 5 minutes the next
+        // system cron task should spawn and we want to have at most three
+        // cron jobs running in parallel.
+        $endTime = time() + 14 * 60;
+
+        $executedJobs = [];
+        while ($job = $jobList->getNext($onlyTimeSensitive)) {
+            if (isset($executedJobs[$job->getId()])) {
+                $jobList->unlockJob($job);
+                break;
+            }
+
+            $job->execute($jobList, $logger);
+            // clean up after unclean jobs
+            \OC_Util::tearDownFS();
+
+            $jobList->setLastJob($job);
+            $executedJobs[$job->getId()] = true;
+            unset($job);
+
+            if (time() > $endTime) {
+                break;
+            }
+        }
+    } else {
+        // We call cron.php from some website
+        if ($appMode === 'cron') {
+            // Cron is cron :-P
+            OC_JSON::error(['data' => ['message' => 'Backgroundjobs are using system cron!']]);
+        } else {
+            // Work and success :-)
+            $jobList = \OC::$server->getJobList();
+            $job = $jobList->getNext();
+            if ($job != null) {
+                $job->execute($jobList, $logger);
+                $jobList->setLastJob($job);
+            }
+            OC_JSON::success();
+        }
+    }
+
+    // Log the successful cron execution
+    $config->setAppValue('core', 'lastcron', time());
+    exit();
 } catch (Exception $ex) {
-	\OC::$server->getLogger()->logException($ex, ['app' => 'cron']);
-	echo $ex . PHP_EOL;
-	exit(1);
+    \OC::$server->getLogger()->logException($ex, ['app' => 'cron']);
+    echo $ex . PHP_EOL;
+    exit(1);
 } catch (Error $ex) {
-	\OC::$server->getLogger()->logException($ex, ['app' => 'cron']);
-	echo $ex . PHP_EOL;
-	exit(1);
+    \OC::$server->getLogger()->logException($ex, ['app' => 'cron']);
+    echo $ex . PHP_EOL;
+    exit(1);
 }

lib/private/Security/Bruteforce/CleanupJob.php

Indentation +21 added lines, -21 removed lines

@@ -33,25 +33,25 @@
 
 class CleanupJob extends TimedJob {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	public function __construct(ITimeFactory $time, IDBConnection $connection) {
-		parent::__construct($time);
-		$this->connection = $connection;
-
-		// Run once a day
-		$this->setInterval(3600 * 24);
-		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
-	}
-
-	protected function run($argument) {
-		// Delete all entries more than 48 hours old
-		$time = $this->time->getTime() - (48 * 3600);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('bruteforce_attempts')
-			->where($qb->expr()->lt('occurred', $qb->createNamedParameter($time), IQueryBuilder::PARAM_INT));
-		$qb->execute();
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    public function __construct(ITimeFactory $time, IDBConnection $connection) {
+        parent::__construct($time);
+        $this->connection = $connection;
+
+        // Run once a day
+        $this->setInterval(3600 * 24);
+        $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
+    }
+
+    protected function run($argument) {
+        // Delete all entries more than 48 hours old
+        $time = $this->time->getTime() - (48 * 3600);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('bruteforce_attempts')
+            ->where($qb->expr()->lt('occurred', $qb->createNamedParameter($time), IQueryBuilder::PARAM_INT));
+        $qb->execute();
+    }
 }

lib/private/BackgroundJob/JobList.php

Indentation +333 added lines, -333 removed lines

@@ -40,337 +40,337 @@
 
 class JobList implements IJobList {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/**@var IConfig */
-	protected $config;
-
-	/**@var ITimeFactory */
-	protected $timeFactory;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function add($job, $argument = null) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-
-		$argumentJson = json_encode($argument);
-		if (strlen($argumentJson) > 4000) {
-			throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		if (!$this->has($job, $argument)) {
-			$query->insert('jobs')
-				->values([
-					'class' => $query->createNamedParameter($class),
-					'argument' => $query->createNamedParameter($argumentJson),
-					'argument_hash' => $query->createNamedParameter(md5($argumentJson)),
-					'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
-					'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
-				]);
-		} else {
-			$query->update('jobs')
-				->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-				->set('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT))
-				->where($query->expr()->eq('class', $query->createNamedParameter($class)))
-				->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson))));
-		}
-		$query->executeStatement();
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function remove($job, $argument = null) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)));
-		if (!is_null($argument)) {
-			$argument = json_encode($argument);
-			$query->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
-		}
-		$query->execute();
-	}
-
-	/**
-	 * @param int $id
-	 */
-	protected function removeById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 * @return bool
-	 */
-	public function has($job, $argument) {
-		if ($job instanceof IJob) {
-			$class = get_class($job);
-		} else {
-			$class = $job;
-		}
-		$argument = json_encode($argument);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('jobs')
-			->where($query->expr()->eq('class', $query->createNamedParameter($class)))
-			->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argument))))
-			->setMaxResults(1);
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool) $row;
-	}
-
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return IJob[]
-	 * @deprecated 9.0.0 - This method is dangerous since it can cause load and
-	 * memory problems when creating too many instances.
-	 */
-	public function getAll() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs');
-		$result = $query->execute();
-
-		$jobs = [];
-		while ($row = $result->fetch()) {
-			$job = $this->buildJob($row);
-			if ($job) {
-				$jobs[] = $job;
-			}
-		}
-		$result->closeCursor();
-
-		return $jobs;
-	}
-
-	/**
-	 * get the next job in the list
-	 *
-	 * @param bool $onlyTimeSensitive
-	 * @return IJob|null
-	 */
-	public function getNext(bool $onlyTimeSensitive = true): ?IJob {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 12 * 3600, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->lte('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)))
-			->orderBy('last_checked', 'ASC')
-			->setMaxResults(1);
-
-		if ($onlyTimeSensitive) {
-			$query->andWhere($query->expr()->eq('time_sensitive', $query->createNamedParameter(IJob::TIME_SENSITIVE, IQueryBuilder::PARAM_INT)));
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('jobs')
-			->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
-			->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
-			->where($update->expr()->eq('id', $update->createParameter('jobid')))
-			->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
-			->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			$update->setParameter('jobid', $row['id']);
-			$update->setParameter('reserved_at', $row['reserved_at']);
-			$update->setParameter('last_checked', $row['last_checked']);
-			$count = $update->execute();
-
-			if ($count === 0) {
-				// Background job already executed elsewhere, try again.
-				return $this->getNext($onlyTimeSensitive);
-			}
-			$job = $this->buildJob($row);
-
-			if ($job === null) {
-				// set the last_checked to 12h in the future to not check failing jobs all over again
-				$reset = $this->connection->getQueryBuilder();
-				$reset->update('jobs')
-					->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
-					->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
-					->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
-				$reset->execute();
-
-				// Background job from disabled app, try again.
-				return $this->getNext($onlyTimeSensitive);
-			}
-
-			return $job;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param int $id
-	 * @return IJob|null
-	 */
-	public function getById($id) {
-		$row = $this->getDetailsById($id);
-
-		if ($row) {
-			return $this->buildJob($row);
-		}
-
-		return null;
-	}
-
-	public function getDetailsById(int $id): ?array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$result = $query->executeQuery();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row) {
-			return $row;
-		}
-
-		return null;
-	}
-
-	/**
-	 * get the job object from a row in the db
-	 *
-	 * @param array $row
-	 * @return IJob|null
-	 */
-	private function buildJob($row) {
-		try {
-			try {
-				// Try to load the job as a service
-				/** @var IJob $job */
-				$job = \OC::$server->query($row['class']);
-			} catch (QueryException $e) {
-				if (class_exists($row['class'])) {
-					$class = $row['class'];
-					$job = new $class();
-				} else {
-					// job from disabled app or old version of an app, no need to do anything
-					return null;
-				}
-			}
-
-			$job->setId((int) $row['id']);
-			$job->setLastRun((int) $row['last_run']);
-			$job->setArgument(json_decode($row['argument'], true));
-			return $job;
-		} catch (AutoloadNotAllowedException $e) {
-			// job is from a disabled app, ignore
-			return null;
-		}
-	}
-
-	/**
-	 * set the job that was last ran
-	 *
-	 * @param IJob $job
-	 */
-	public function setLastJob(IJob $job) {
-		$this->unlockJob($job);
-		$this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
-	}
-
-	/**
-	 * Remove the reservation for a job
-	 *
-	 * @param IJob $job
-	 */
-	public function unlockJob(IJob $job) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * set the lastRun of $job to now
-	 *
-	 * @param IJob $job
-	 */
-	public function setLastRun(IJob $job) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-
-		if ($job instanceof \OCP\BackgroundJob\TimedJob
-			&& !$job->isTimeSensitive()) {
-			$query->set('time_sensitive', $query->createNamedParameter(IJob::TIME_INSENSITIVE));
-		}
-
-		$query->execute();
-	}
-
-	/**
-	 * @param IJob $job
-	 * @param $timeTaken
-	 */
-	public function setExecutionTime(IJob $job, $timeTaken) {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * Reset the $job so it executes on the next trigger
-	 *
-	 * @param IJob $job
-	 * @since 23.0.0
-	 */
-	public function resetBackgroundJob(IJob $job): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('jobs')
-			->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT));
-		$query->executeStatement();
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /**@var IConfig */
+    protected $config;
+
+    /**@var ITimeFactory */
+    protected $timeFactory;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function add($job, $argument = null) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+
+        $argumentJson = json_encode($argument);
+        if (strlen($argumentJson) > 4000) {
+            throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        if (!$this->has($job, $argument)) {
+            $query->insert('jobs')
+                ->values([
+                    'class' => $query->createNamedParameter($class),
+                    'argument' => $query->createNamedParameter($argumentJson),
+                    'argument_hash' => $query->createNamedParameter(md5($argumentJson)),
+                    'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
+                    'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
+                ]);
+        } else {
+            $query->update('jobs')
+                ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
+                ->set('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT))
+                ->where($query->expr()->eq('class', $query->createNamedParameter($class)))
+                ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson))));
+        }
+        $query->executeStatement();
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function remove($job, $argument = null) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)));
+        if (!is_null($argument)) {
+            $argument = json_encode($argument);
+            $query->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
+        }
+        $query->execute();
+    }
+
+    /**
+     * @param int $id
+     */
+    protected function removeById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * check if a job is in the list
+     *
+     * @param IJob|string $job
+     * @param mixed $argument
+     * @return bool
+     */
+    public function has($job, $argument) {
+        if ($job instanceof IJob) {
+            $class = get_class($job);
+        } else {
+            $class = $job;
+        }
+        $argument = json_encode($argument);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('jobs')
+            ->where($query->expr()->eq('class', $query->createNamedParameter($class)))
+            ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argument))))
+            ->setMaxResults(1);
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        return (bool) $row;
+    }
+
+    /**
+     * get all jobs in the list
+     *
+     * @return IJob[]
+     * @deprecated 9.0.0 - This method is dangerous since it can cause load and
+     * memory problems when creating too many instances.
+     */
+    public function getAll() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs');
+        $result = $query->execute();
+
+        $jobs = [];
+        while ($row = $result->fetch()) {
+            $job = $this->buildJob($row);
+            if ($job) {
+                $jobs[] = $job;
+            }
+        }
+        $result->closeCursor();
+
+        return $jobs;
+    }
+
+    /**
+     * get the next job in the list
+     *
+     * @param bool $onlyTimeSensitive
+     * @return IJob|null
+     */
+    public function getNext(bool $onlyTimeSensitive = true): ?IJob {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->lte('reserved_at', $query->createNamedParameter($this->timeFactory->getTime() - 12 * 3600, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->lte('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)))
+            ->orderBy('last_checked', 'ASC')
+            ->setMaxResults(1);
+
+        if ($onlyTimeSensitive) {
+            $query->andWhere($query->expr()->eq('time_sensitive', $query->createNamedParameter(IJob::TIME_SENSITIVE, IQueryBuilder::PARAM_INT)));
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('jobs')
+            ->set('reserved_at', $update->createNamedParameter($this->timeFactory->getTime()))
+            ->set('last_checked', $update->createNamedParameter($this->timeFactory->getTime()))
+            ->where($update->expr()->eq('id', $update->createParameter('jobid')))
+            ->andWhere($update->expr()->eq('reserved_at', $update->createParameter('reserved_at')))
+            ->andWhere($update->expr()->eq('last_checked', $update->createParameter('last_checked')));
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            $update->setParameter('jobid', $row['id']);
+            $update->setParameter('reserved_at', $row['reserved_at']);
+            $update->setParameter('last_checked', $row['last_checked']);
+            $count = $update->execute();
+
+            if ($count === 0) {
+                // Background job already executed elsewhere, try again.
+                return $this->getNext($onlyTimeSensitive);
+            }
+            $job = $this->buildJob($row);
+
+            if ($job === null) {
+                // set the last_checked to 12h in the future to not check failing jobs all over again
+                $reset = $this->connection->getQueryBuilder();
+                $reset->update('jobs')
+                    ->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
+                    ->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
+                    ->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
+                $reset->execute();
+
+                // Background job from disabled app, try again.
+                return $this->getNext($onlyTimeSensitive);
+            }
+
+            return $job;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param int $id
+     * @return IJob|null
+     */
+    public function getById($id) {
+        $row = $this->getDetailsById($id);
+
+        if ($row) {
+            return $this->buildJob($row);
+        }
+
+        return null;
+    }
+
+    public function getDetailsById(int $id): ?array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('jobs')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $result = $query->executeQuery();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row) {
+            return $row;
+        }
+
+        return null;
+    }
+
+    /**
+     * get the job object from a row in the db
+     *
+     * @param array $row
+     * @return IJob|null
+     */
+    private function buildJob($row) {
+        try {
+            try {
+                // Try to load the job as a service
+                /** @var IJob $job */
+                $job = \OC::$server->query($row['class']);
+            } catch (QueryException $e) {
+                if (class_exists($row['class'])) {
+                    $class = $row['class'];
+                    $job = new $class();
+                } else {
+                    // job from disabled app or old version of an app, no need to do anything
+                    return null;
+                }
+            }
+
+            $job->setId((int) $row['id']);
+            $job->setLastRun((int) $row['last_run']);
+            $job->setArgument(json_decode($row['argument'], true));
+            return $job;
+        } catch (AutoloadNotAllowedException $e) {
+            // job is from a disabled app, ignore
+            return null;
+        }
+    }
+
+    /**
+     * set the job that was last ran
+     *
+     * @param IJob $job
+     */
+    public function setLastJob(IJob $job) {
+        $this->unlockJob($job);
+        $this->config->setAppValue('backgroundjob', 'lastjob', $job->getId());
+    }
+
+    /**
+     * Remove the reservation for a job
+     *
+     * @param IJob $job
+     */
+    public function unlockJob(IJob $job) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * set the lastRun of $job to now
+     *
+     * @param IJob $job
+     */
+    public function setLastRun(IJob $job) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('last_run', $query->createNamedParameter(time(), IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+
+        if ($job instanceof \OCP\BackgroundJob\TimedJob
+            && !$job->isTimeSensitive()) {
+            $query->set('time_sensitive', $query->createNamedParameter(IJob::TIME_INSENSITIVE));
+        }
+
+        $query->execute();
+    }
+
+    /**
+     * @param IJob $job
+     * @param $timeTaken
+     */
+    public function setExecutionTime(IJob $job, $timeTaken) {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * Reset the $job so it executes on the next trigger
+     *
+     * @param IJob $job
+     * @since 23.0.0
+     */
+    public function resetBackgroundJob(IJob $job): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('jobs')
+            ->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+            ->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT));
+        $query->executeStatement();
+    }
 }

lib/public/BackgroundJob/IJob.php

Indentation +52 added lines, -52 removed lines

@@ -34,63 +34,63 @@
  * @since 7.0.0
  */
 interface IJob {
-	/**
-	 * @since 24.0.0
-	 */
-	public const TIME_INSENSITIVE = 0;
-	/**
-	 * @since 24.0.0
-	 */
-	public const TIME_SENSITIVE = 1;
+    /**
+     * @since 24.0.0
+     */
+    public const TIME_INSENSITIVE = 0;
+    /**
+     * @since 24.0.0
+     */
+    public const TIME_SENSITIVE = 1;
 
-	/**
-	 * Run the background job with the registered argument
-	 *
-	 * @param IJobList $jobList The job list that manages the state of this job
-	 * @param ILogger|null $logger
-	 * @since 7.0.0
-	 */
-	public function execute(IJobList $jobList, ILogger $logger = null);
+    /**
+     * Run the background job with the registered argument
+     *
+     * @param IJobList $jobList The job list that manages the state of this job
+     * @param ILogger|null $logger
+     * @since 7.0.0
+     */
+    public function execute(IJobList $jobList, ILogger $logger = null);
 
-	/**
-	 * @since 7.0.0
-	 */
-	public function setId(int $id);
+    /**
+     * @since 7.0.0
+     */
+    public function setId(int $id);
 
-	/**
-	 * @since 7.0.0
-	 */
-	public function setLastRun(int $lastRun);
+    /**
+     * @since 7.0.0
+     */
+    public function setLastRun(int $lastRun);
 
-	/**
-	 * @param mixed $argument
-	 * @since 7.0.0
-	 */
-	public function setArgument($argument);
+    /**
+     * @param mixed $argument
+     * @since 7.0.0
+     */
+    public function setArgument($argument);
 
-	/**
-	 * Get the id of the background job
-	 * This id is determined by the job list when a job is added to the list
-	 *
-	 * @return int
-	 * @since 7.0.0
-	 */
-	public function getId();
+    /**
+     * Get the id of the background job
+     * This id is determined by the job list when a job is added to the list
+     *
+     * @return int
+     * @since 7.0.0
+     */
+    public function getId();
 
-	/**
-	 * Get the last time this job was run as unix timestamp
-	 *
-	 * @return int
-	 * @since 7.0.0
-	 */
-	public function getLastRun();
+    /**
+     * Get the last time this job was run as unix timestamp
+     *
+     * @return int
+     * @since 7.0.0
+     */
+    public function getLastRun();
 
-	/**
-	 * Get the argument associated with the background job
-	 * This is the argument that will be passed to the background job
-	 *
-	 * @return mixed
-	 * @since 7.0.0
-	 */
-	public function getArgument();
+    /**
+     * Get the argument associated with the background job
+     * This is the argument that will be passed to the background job
+     *
+     * @return mixed
+     * @since 7.0.0
+     */
+    public function getArgument();
 }