Skip to content

Commit 9f4a534

Browse files
authored
Merge pull request #563 from nextcloud/log-internet-connection-exception
Log exception that is thrown by internet connection check
2 parents 1b1ff3b + 5da813f commit 9f4a534

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

settings/Application.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ public function __construct(array $urlParams=[]){
174174
$c->query('URLGenerator'),
175175
$c->query('Util'),
176176
$c->query('L10N'),
177-
$c->query('Checker')
177+
$c->query('Checker'),
178+
$c->query('Logger')
178179
);
179180
});
180181

settings/Controller/CheckSetupController.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
use OCP\Http\Client\IClientService;
3737
use OCP\IConfig;
3838
use OCP\IL10N;
39+
use OCP\ILogger;
3940
use OCP\IRequest;
4041
use OC_Util;
4142
use OCP\IURLGenerator;
@@ -56,6 +57,8 @@ class CheckSetupController extends Controller {
5657
private $l10n;
5758
/** @var Checker */
5859
private $checker;
60+
/** @var ILogger */
61+
private $logger;
5962

6063
/**
6164
* @param string $AppName
@@ -66,6 +69,7 @@ class CheckSetupController extends Controller {
6669
* @param \OC_Util $util
6770
* @param IL10N $l10n
6871
* @param Checker $checker
72+
* @param ILogger $logger
6973
*/
7074
public function __construct($AppName,
7175
IRequest $request,
@@ -74,14 +78,16 @@ public function __construct($AppName,
7478
IURLGenerator $urlGenerator,
7579
\OC_Util $util,
7680
IL10N $l10n,
77-
Checker $checker) {
81+
Checker $checker,
82+
ILogger $logger) {
7883
parent::__construct($AppName, $request);
7984
$this->config = $config;
8085
$this->clientService = $clientService;
8186
$this->util = $util;
8287
$this->urlGenerator = $urlGenerator;
8388
$this->l10n = $l10n;
8489
$this->checker = $checker;
90+
$this->logger = $logger;
8591
}
8692

8793
/**
@@ -118,6 +124,7 @@ private function isSiteReachable($sitename) {
118124
$client->get($httpSiteName);
119125
$client->get($httpsSiteName);
120126
} catch (\Exception $e) {
127+
$this->logger->logException($e, ['app' => 'internet_connection_check']);
121128
return false;
122129
}
123130
return true;

0 commit comments

Comments
 (0)