Bring logger config up to date with library

Fix local Varnish IP

Rename services.xml to cache_manager.xml

Log to file not stdout

Author: ddeboer

DependencyInjection/Compiler/LoggerPass.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace FOS\HttpCacheBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * E
+ */
+class LoggerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->has('logger')) {
+            return;
+        }
+
+        $subscriber = $container->getDefinition('fos_http_cache.proxy.log_subscriber')
+            ->setAbstract(false);
+
+        $container->getDefinition('fos_http_cache.cache_manager')
+            ->addMethodCall('addSubscriber', array($subscriber));
+    }
+}

DependencyInjection/FOSHttpCacheExtension.php

@@ -23,7 +23,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.xml');
+        $loader->load('cache_manager.xml');
 
         $container->setParameter($this->getAlias().'.debug', $config['debug']);
         $container->setParameter($this->getAlias().'.invalidators', $config['invalidators']);

FOSHttpCacheBundle.php

@@ -2,8 +2,17 @@
 
 namespace FOS\HttpCacheBundle;
 
+use FOS\HttpCacheBundle\DependencyInjection\Compiler\LoggerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class FOSHttpCacheBundle extends Bundle
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new LoggerPass());
+    }
 }

Resources/config/services.xml renamed to Resources/config/cache_manager.xml

@@ -16,9 +16,19 @@
                  class="FOS\HttpCacheBundle\CacheManager">
             <argument type="service" id="fos_http_cache.http_cache" />
             <argument type="service" id="router" />
+            <call method="setEventDispatcher">
+                <argument id="event_dispatcher" type="service" on-invalid="ignore" />
+            </call>
         </service>
 
-        <service id="fos_http_cache.event_listener.invalidation" class="FOS\HttpCacheBundle\EventListener\InvalidationListener">
+        <service id="fos_http_cache.proxy.log_subscriber"
+                 class="FOS\HttpCache\EventListener\LogSubscriber"
+                 abstract="true">
+            <argument type="service" id="logger" />
+        </service>
+
+        <service id="fos_http_cache.event_listener.invalidation"
+                 class="FOS\HttpCacheBundle\EventListener\InvalidationListener">
             <argument type="service" id="fos_http_cache.cache_manager" />
             <argument type="service" id="fos_http_cache.invalidator.collection" />
             <argument type="service" id="router" />

Resources/config/varnish.xml

@@ -9,9 +9,6 @@
                  class="FOS\HttpCache\Invalidation\Varnish">
             <argument>%fos_http_cache.varnish.ips%</argument>
             <argument>%fos_http_cache.varnish.host%</argument>
-            <call method="setLogger">
-                <argument id="logger" type="service" on-invalid="null" />
-            </call>
         </service>
 
         <service id="fos_http_cache.http_cache"

Tests/Functional/Fixtures/app/config/config.yml

@@ -6,4 +6,10 @@ framework:
 
 fos_http_cache:
   varnish:
-    ips: 192.168.0.1
+    ips: 127.0.0.1
+
+monolog:
+  handlers:
+    main:
+      type: stream
+      level: debug