Reset job disabling timer on adding the job again

Signed-off-by: Julius Härtl <[email protected]>

Author: juliusknorr

lib/private/BackgroundJob/JobList.php

@@ -65,6 +65,7 @@ public function __construct(IDBConnection $connection, IConfig $config, ITimeFac
 	 * @param mixed $argument
 	 */
 	public function add($job, $argument = null) {
+		$query = $this->connection->getQueryBuilder();
 		if (!$this->has($job, $argument)) {
 			if ($job instanceof IJob) {
 				$class = get_class($job);
@@ -77,7 +78,6 @@ public function add($job, $argument = null) {
 				throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
 			}
 
-			$query = $this->connection->getQueryBuilder();
 			$query->insert('jobs')
 				->values([
 					'class' => $query->createNamedParameter($class),
@@ -86,6 +86,25 @@ public function add($job, $argument = null) {
 					'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
 				]);
 			$query->execute();
+		} else {
+			if ($job instanceof IJob) {
+				$class = get_class($job);
+			} else {
+				$class = $job;
+			}
+
+			$argument = json_encode($argument);
+			if (strlen($argument) > 4000) {
+				throw new \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
+			}
+
+			$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(), IQueryBuilder::PARAM_INT))
+				->where($query->expr()->eq('class', $reset->createNamedParameter($class)))
+				->andWhere($query->expr()->eq('argument', $reset->createNamedParameter($argument)));
+			$reset->execute();
 		}
 	}