From: Jeremy Benoist Date: Mon, 13 Feb 2017 13:19:53 +0000 (+0100) Subject: Log restricted access value X-Git-Tag: 2.2.2~24^2 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=7bf6b555f56a254a13cee91776df6f4f49fe6fec Log restricted access value It might help to figure out if we have enabled it or not --- diff --git a/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php b/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php index 8891887b..1ac8feb1 100644 --- a/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php +++ b/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php @@ -6,6 +6,7 @@ use Graby\Ring\Client\SafeCurlHandler; use GuzzleHttp\Client; use GuzzleHttp\Cookie\CookieJar; use GuzzleHttp\Event\SubscriberInterface; +use Psr\Log\LoggerInterface; /** * Builds and configures the Guzzle HTTP client. @@ -19,6 +20,7 @@ class HttpClientFactory private $cookieJar; private $restrictedAccess; + private $logger; /** * HttpClientFactory constructor. @@ -26,12 +28,14 @@ class HttpClientFactory * @param \GuzzleHttp\Event\SubscriberInterface $authenticatorSubscriber * @param \GuzzleHttp\Cookie\CookieJar $cookieJar * @param string $restrictedAccess this param is a kind of boolean. Values: 0 or 1 + * @param LoggerInterface $logger */ - public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess) + public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger) { $this->authenticatorSubscriber = $authenticatorSubscriber; $this->cookieJar = $cookieJar; $this->restrictedAccess = $restrictedAccess; + $this->logger = $logger; } /** @@ -39,8 +43,10 @@ class HttpClientFactory */ public function buildHttpClient() { + $this->logger->log('debug', 'Restricted access config enabled?', array('enabled' => (int) $this->restrictedAccess)); + if (0 === (int) $this->restrictedAccess) { - return null; + return; } // we clear the cookie to avoid websites who use cookies for analytics diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 036735ec..51d6ab47 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -74,6 +74,7 @@ services: - "@bd_guzzle_site_authenticator.authenticator_subscriber" - "@wallabag_core.guzzle.cookie_jar" - '@=service(''craue_config'').get(''restricted_access'')' + - '@logger' wallabag_core.guzzle.cookie_jar: class: GuzzleHttp\Cookie\FileCookieJar