aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <91878298+come-nc@users.noreply.github.com>2023-09-07 09:33:06 +0200
committerGitHub <noreply@github.com>2023-09-07 09:33:06 +0200
commit8549ea40258ea396490d56f113050601de9e8a15 (patch)
treec6a20687a948da7fb636da8796034b2006f2cb69
parent80a4b369f8831980d81da9e2396fe4c6977b6323 (diff)
parent9a179c391e5454dba227e1acb8be791660b58be7 (diff)
downloadnextcloud-server-8549ea40258ea396490d56f113050601de9e8a15.tar.gz
nextcloud-server-8549ea40258ea396490d56f113050601de9e8a15.zip
Merge pull request #40216 from nextcloud/print-log-message-when-version-could-not-be-got-from-updater-server
Print log message when version could not be got from updater server
-rw-r--r--lib/private/Updater/VersionCheck.php4
-rw-r--r--tests/lib/Updater/VersionCheckTest.php5
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php
index 2aab260716a..97f770b6998 100644
--- a/lib/private/Updater/VersionCheck.php
+++ b/lib/private/Updater/VersionCheck.php
@@ -31,6 +31,7 @@ use OCP\IConfig;
use OCP\IUserManager;
use OCP\Support\Subscription\IRegistry;
use OCP\Util;
+use Psr\Log\LoggerInterface;
class VersionCheck {
public function __construct(
@@ -38,6 +39,7 @@ class VersionCheck {
private IConfig $config,
private IUserManager $userManager,
private IRegistry $registry,
+ private LoggerInterface $logger,
) {
}
@@ -86,6 +88,8 @@ class VersionCheck {
try {
$xml = $this->getUrlContent($url);
} catch (\Exception $e) {
+ $this->logger->info('Version could not be fetched from updater server: ' . $url, ['exception' => $e]);
+
return false;
}
diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php
index be847253035..0f073abc3ce 100644
--- a/tests/lib/Updater/VersionCheckTest.php
+++ b/tests/lib/Updater/VersionCheckTest.php
@@ -28,6 +28,7 @@ use OCP\IConfig;
use OCP\IUserManager;
use OCP\Support\Subscription\IRegistry;
use OCP\Util;
+use Psr\Log\LoggerInterface;
class VersionCheckTest extends \Test\TestCase {
/** @var IConfig| \PHPUnit\Framework\MockObject\MockObject */
@@ -36,6 +37,8 @@ class VersionCheckTest extends \Test\TestCase {
private $updater;
/** @var IRegistry | \PHPUnit\Framework\Mo2ckObject\MockObject*/
private $registry;
+ /** @var LoggerInterface | \PHPUnit\Framework\Mo2ckObject\MockObject*/
+ private $logger;
protected function setUp(): void {
parent::setUp();
@@ -50,6 +53,7 @@ class VersionCheckTest extends \Test\TestCase {
$this->registry
->method('delegateHasValidSubscription')
->willReturn(false);
+ $this->logger = $this->createMock(LoggerInterface::class);
$this->updater = $this->getMockBuilder(VersionCheck::class)
->setMethods(['getUrlContent'])
->setConstructorArgs([
@@ -57,6 +61,7 @@ class VersionCheckTest extends \Test\TestCase {
$this->config,
$this->createMock(IUserManager::class),
$this->registry,
+ $this->logger,
])
->getMock();
}