Merge pull request #6688 from Quetzacoalt91/cache-on-guzzle-requests

Enable cache on guzzle requests
PrestaShop · Oct 17, 2016 · 83a16f3 · 83a16f3
2 parents 8fd0a53 + 6c06898
commit 83a16f3
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 0 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -99,6 +99,9 @@ swiftmailer:
 csa_guzzle:
     profiler:
         enabled: "%kernel.debug%"
+    cache:
+        enabled: true
+        adapter: guzzle.cache
     clients:
         addons_api:
             config: # you can specify the options as in http://docs.guzzlephp.org/en/latest/quickstart.html#creating-a-client
@@ -110,4 +113,5 @@ csa_guzzle:
 prestashop:
     addons:
         api_client:
+            ttl: 7200 # 2h
             verify_ssl: ~ # true by default, declaring "addons.api_client.verify_ssl" parameter overrides its usage
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -44,3 +44,8 @@ monolog:
 
 #swiftmailer:
 #    delivery_address: me@example.com
+
+prestashop:
+    addons:
+        api_client:
+            ttl: 300 # 5min
diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
     "symfony/symfony": "~2.8.6",
     "defuse/php-encryption": "~2.0.1",
     "doctrine/dbal": "~2.5.3",
+    "doctrine/cache": "~1.6|~1.5",
     "doctrine/common": "~2.5.3",
     "doctrine/orm": "~2.5.3",
     "ext-intl": "*",

diff --git a/src/PrestaShopBundle/DependencyInjection/AddOnsConfiguration.php b/src/PrestaShopBundle/DependencyInjection/AddOnsConfiguration.php
@@ -41,6 +41,9 @@ public function getConfigTreeBuilder()
                     ->children()
                         ->arrayNode('api_client')
                             ->children()
+                                ->integerNode('ttl')
+                                    ->defaultValue(0)
+                                ->end()
                                 ->booleanNode('verify_ssl')
                                     ->defaultTrue()
                                 ->end()

diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -55,6 +55,9 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $container->setParameter('prestashop.addons.api_client.verify_ssl', $verifySsl);
+        if (!$container->hasParameter('prestashop.addons.api_client.ttl')) {
+            $container->setParameter('prestashop.addons.api_client.ttl', $config['addons']['api_client']['ttl']);
+        }
 
         $this->addClassesToCompile(array(
             $container->getDefinition('prestashop.router')->getClass(),

diff --git a/src/PrestaShopBundle/Resources/config/services.yml b/src/PrestaShopBundle/Resources/config/services.yml
@@ -6,6 +6,18 @@ services:
     finder:
         class: Symfony\Component\Finder\Finder
         shared: false
+
+    guzzle.cache.provider:
+        class: Doctrine\Common\Cache\FilesystemCache
+        arguments:
+            - "%kernel.cache_dir%/guzzle"
+
+    guzzle.cache:
+        class: Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\DoctrineAdapter
+        arguments:
+            - "@guzzle.cache.provider"
+            - "%prestashop.addons.api_client.ttl%"
+        shared: false
 
     main.warmer.cache_warmer:
         class: PrestaShopBundle\Cache\CacheWarmer