Merge pull request #43465 from nextcloud/artonge/fix/bad_revert_commit

Fix bad revert commit

4 files changed, 35 insertions, 35 deletions

diff --git a/core/Command/Background/Job.php b/core/Command/Background/Job.php
index aeee60bd6a5..fdfb7484b51 100644
--- a/core/Command/Background/Job.php
+++ b/core/Command/Background/Job.php
@@ -27,7 +27,6 @@ namespace OC\Core\Command\Background;
 
 use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\IJobList;
-use OCP\ILogger;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -37,7 +36,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 class Job extends Command {
 	public function __construct(
 		protected IJobList $jobList,
-		protected ILogger $logger,
 	) {
 		parent::__construct();
 	}
@@ -86,14 +84,14 @@ class Job extends Command {
 			$output->writeln('<error>Something went wrong when trying to retrieve Job with ID ' . $jobId . ' from database</error>');
 			return 1;
 		}
-		$job->execute($this->jobList, $this->logger);
+		$job->start($this->jobList);
 		$job = $this->jobList->getById($jobId);
 
 		if (($job === null) || ($lastRun !== $job->getLastRun())) {
 			$output->writeln('<info>Job executed!</info>');
 			$output->writeln('');
 
-			if ($job instanceof \OC\BackgroundJob\TimedJob || $job instanceof \OCP\BackgroundJob\TimedJob) {
+			if ($job instanceof \OCP\BackgroundJob\TimedJob) {
 				$this->printJobInfo($jobId, $job, $output);
 			}
 		} else {
@@ -117,10 +115,10 @@ class Job extends Command {
 		$output->writeln('Job class:            ' . get_class($job));
 		$output->writeln('Arguments:            ' . json_encode($job->getArgument()));
 
-		$isTimedJob = $job instanceof \OC\BackgroundJob\TimedJob || $job instanceof \OCP\BackgroundJob\TimedJob;
+		$isTimedJob = $job instanceof \OCP\BackgroundJob\TimedJob;
 		if ($isTimedJob) {
 			$output->writeln('Type:                 timed');
-		} elseif ($job instanceof \OC\BackgroundJob\QueuedJob || $job instanceof \OCP\BackgroundJob\QueuedJob) {
+		} elseif ($job instanceof \OCP\BackgroundJob\QueuedJob) {
 			$output->writeln('Type:                 queued');
 		} else {
 			$output->writeln('Type:                 job');
diff --git a/core/ajax/update.php b/core/ajax/update.php
index a826b6b7e7a..63d1bd3cf5e 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -43,8 +43,8 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IEventSource;
 use OCP\IEventSourceFactory;
 use OCP\IL10N;
-use OCP\ILogger;
 use OCP\L10N\IFactory;
+use Psr\Log\LoggerInterface;
 
 if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) {
 	@set_time_limit(0);
@@ -186,10 +186,12 @@ if (\OCP\Util::needUpgrade()) {
 	try {
 		$updater->upgrade();
 	} catch (\Exception $e) {
-		\OC::$server->getLogger()->logException($e, [
-			'level' => ILogger::ERROR,
-			'app' => 'update',
-		]);
+		\OCP\Server::get(LoggerInterface::class)->error(
+			$e->getMessage(),
+			[
+				'exception' => $e,
+				'app' => 'update',
+			]);
 		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
 		$eventSource->close();
 		exit();
diff --git a/core/l10n/ka.js b/core/l10n/ka.js
index 3deb4136b99..9f34335f9b4 100644
--- a/core/l10n/ka.js
+++ b/core/l10n/ka.js
@@ -1,18 +1,18 @@
 OC.L10N.register(
     "core",
     {
-    "Please select a file." : "Please select a file.",
-    "File is too big" : "File is too big",
-    "The selected file is not an image." : "The selected file is not an image.",
-    "The selected file cannot be read." : "The selected file cannot be read.",
-    "The file was uploaded" : "The file was uploaded",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "The uploaded file exceeds the upload_max_filesize directive in php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
-    "The file was only partially uploaded" : "The file was only partially uploaded",
-    "No file was uploaded" : "No file was uploaded",
-    "Missing a temporary folder" : "Missing a temporary folder",
-    "Could not write file to disk" : "Could not write file to disk",
-    "A PHP extension stopped the file upload" : "A PHP extension stopped the file upload",
+    "Please select a file." : "გთხოვთ, აირჩიოთ ფაილი.",
+    "File is too big" : "ფაილი ზედმეტად დიდია",
+    "The selected file is not an image." : "არჩეული ფაილი არ არის სურათი.",
+    "The selected file cannot be read." : "არჩეული ფაილი ვერ იკითხება.",
+    "The file was uploaded" : "ფაილი ატვირთულ იქნა",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "ატვირთული ფაილი აჭარბებს php.ini-ში დაყენებულ upload_max_filesize დირექტივას",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "ატვირთული ფაილი აჭარბებს MAX_FILE_SIZE დირექტივას, რომელიც მითითებული იყო HTML ფორმაში",
+    "The file was only partially uploaded" : "ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
+    "No file was uploaded" : "არცერთი ფაილი არ აიტვირთა",
+    "Missing a temporary folder" : "დროებითი საქაღალდე ვერ იძებნება",
+    "Could not write file to disk" : "დისკზე ჩაწერა ვერ მოხერხდა",
+    "A PHP extension stopped the file upload" : "PHP გაფართოებამ შეწყვიტა ფაილის ატვირთვა",
     "Invalid file provided" : "Invalid file provided",
     "No image or file provided" : "No image or file provided",
     "Unknown filetype" : "Unknown filetype",
diff --git a/core/l10n/ka.json b/core/l10n/ka.json
index f9fb27e9c28..6958931d2b1 100644
--- a/core/l10n/ka.json
+++ b/core/l10n/ka.json
@@ -1,16 +1,16 @@
 { "translations": {
-    "Please select a file." : "Please select a file.",
-    "File is too big" : "File is too big",
-    "The selected file is not an image." : "The selected file is not an image.",
-    "The selected file cannot be read." : "The selected file cannot be read.",
-    "The file was uploaded" : "The file was uploaded",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "The uploaded file exceeds the upload_max_filesize directive in php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
-    "The file was only partially uploaded" : "The file was only partially uploaded",
-    "No file was uploaded" : "No file was uploaded",
-    "Missing a temporary folder" : "Missing a temporary folder",
-    "Could not write file to disk" : "Could not write file to disk",
-    "A PHP extension stopped the file upload" : "A PHP extension stopped the file upload",
+    "Please select a file." : "გთხოვთ, აირჩიოთ ფაილი.",
+    "File is too big" : "ფაილი ზედმეტად დიდია",
+    "The selected file is not an image." : "არჩეული ფაილი არ არის სურათი.",
+    "The selected file cannot be read." : "არჩეული ფაილი ვერ იკითხება.",
+    "The file was uploaded" : "ფაილი ატვირთულ იქნა",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "ატვირთული ფაილი აჭარბებს php.ini-ში დაყენებულ upload_max_filesize დირექტივას",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "ატვირთული ფაილი აჭარბებს MAX_FILE_SIZE დირექტივას, რომელიც მითითებული იყო HTML ფორმაში",
+    "The file was only partially uploaded" : "ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
+    "No file was uploaded" : "არცერთი ფაილი არ აიტვირთა",
+    "Missing a temporary folder" : "დროებითი საქაღალდე ვერ იძებნება",
+    "Could not write file to disk" : "დისკზე ჩაწერა ვერ მოხერხდა",
+    "A PHP extension stopped the file upload" : "PHP გაფართოებამ შეწყვიტა ფაილის ატვირთვა",
     "Invalid file provided" : "Invalid file provided",
     "No image or file provided" : "No image or file provided",
     "Unknown filetype" : "Unknown filetype",