nextcloud / server

lib/public/BackgroundJob/Job.php

Indentation +102 added lines, -103 removed lines

@@ -37,107 +37,106 @@
  */
 abstract class Job implements IJob {
 
-	/** @var int $id */
-	protected $id;
-
-	/** @var int $lastRun */
-	protected $lastRun;
-
-	/** @var mixed $argument */
-	protected $argument;
-
-	/** @var ITimeFactory */
-	protected $time;
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function __construct(ITimeFactory $time) {
-		$this->time = $time;
-	}
-
-	/**
-	 * The function to prepare the execution of the job.
-
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$jobList->setLastRun($this);
-		if ($logger === null) {
-			$logger = \OC::$server->getLogger();
-		}
-
-		try {
-			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
-			$this->run($this->argument);
-			$timeTaken = $this->time->getTime() - $jobStartTime;
-
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
-			$jobList->setExecutionTime($this, $timeTaken);
-		} catch (\Exception $e) {
-			if ($logger) {
-				$logger->logException($e, [
-					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function setLastRun($lastRun) {
-		$this->lastRun = $lastRun;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function setArgument($argument) {
-		$this->argument = $argument;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function getLastRun(): int {
-		return $this->lastRun;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function getArgument() {
-		return $this->argument;
-	}
-
-	/**
-	 * The actual function that is called to run the job
-	 *
-	 * @param $argument
-	 * @return mixed
-	 *
-	 * @since 15.0.0
-	 */
-	abstract protected function run($argument);
+    /** @var int $id */
+    protected $id;
+
+    /** @var int $lastRun */
+    protected $lastRun;
+
+    /** @var mixed $argument */
+    protected $argument;
+
+    /** @var ITimeFactory */
+    protected $time;
+
+    /**
+     * @since 15.0.0
+     */
+    public function __construct(ITimeFactory $time) {
+        $this->time = $time;
+    }
+
+    /**
+     * The function to prepare the execution of the job.
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $jobList->setLastRun($this);
+        if ($logger === null) {
+            $logger = \OC::$server->getLogger();
+        }
+
+        try {
+            $jobStartTime = $this->time->getTime();
+            $logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+            $this->run($this->argument);
+            $timeTaken = $this->time->getTime() - $jobStartTime;
+
+            $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+            $jobList->setExecutionTime($this, $timeTaken);
+        } catch (\Exception $e) {
+            if ($logger) {
+                $logger->logException($e, [
+                    'app' => 'core',
+                    'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function setLastRun($lastRun) {
+        $this->lastRun = $lastRun;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function setArgument($argument) {
+        $this->argument = $argument;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function getLastRun(): int {
+        return $this->lastRun;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function getArgument() {
+        return $this->argument;
+    }
+
+    /**
+     * The actual function that is called to run the job
+     *
+     * @param $argument
+     * @return mixed
+     *
+     * @since 15.0.0
+     */
+    abstract protected function run($argument);
 }

Spacing +3 added lines, -3 removed lines

@@ -73,17 +73,17 @@
 
 		try {
 			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = $this->time->getTime() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Exception $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}

lib/public/BackgroundJob/QueuedJob.php

Indentation +12 added lines, -12 removed lines

@@ -33,16 +33,16 @@
  */
 abstract class QueuedJob extends Job {
 
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	final public function execute($jobList, ILogger $logger = null) {
-		$jobList->remove($this, $this->argument);
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    final public function execute($jobList, ILogger $logger = null) {
+        $jobList->remove($this, $this->argument);
+        parent::execute($jobList, $logger);
+    }
 }

lib/public/BackgroundJob/TimedJob.php

Indentation +23 added lines, -23 removed lines

@@ -34,29 +34,29 @@
  * @since 15.0.0
  */
 abstract class TimedJob extends Job {
-	/** @var int */
-	protected $interval = 0;
+    /** @var int */
+    protected $interval = 0;
 
-	/**
-	 * set the interval for the job
-	 *
-	 * @since 15.0.0
-	 */
-	public function setInterval(int $interval) {
-		$this->interval = $interval;
-	}
+    /**
+     * set the interval for the job
+     *
+     * @since 15.0.0
+     */
+    public function setInterval(int $interval) {
+        $this->interval = $interval;
+    }
 
-	/**
-	 * run the job if the last run is is more than the interval ago
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	final public function execute($jobList, ILogger $logger = null) {
-		if (($this->time->getTime() - $this->lastRun) > $this->interval) {
-			parent::execute($jobList, $logger);
-		}
-	}
+    /**
+     * run the job if the last run is is more than the interval ago
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    final public function execute($jobList, ILogger $logger = null) {
+        if (($this->time->getTime() - $this->lastRun) > $this->interval) {
+            parent::execute($jobList, $logger);
+        }
+    }
 }