Actually use the logging decorator, if available.

horde · May 14, 2015 · fdd1f0d · fdd1f0d
1 parent 432a0f9
commit fdd1f0d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Base.php
@@ -61,14 +61,14 @@ abstract class Horde_Kolab_Storage_Base
      *
      * @var Horde_Log_Logger
      */
-    private $_logger;
+    protected $_logger;
 
     /**
      * Additional parameters.
      *
      * @var array
      */
-    private $_params;
+    protected $_params;
 
     /**
      * List instances.
@@ -92,7 +92,7 @@ abstract class Horde_Kolab_Storage_Base
      * @param Horde_Kolab_Storage_QuerySet $query_set  The query handler.
      * @param Horde_Kolab_Storage_Factory  $factory    The factory.
      * @param Horde_Kolab_Storage_Cache    $cache      The cache.
-     * @param Horde_Log_Logger             $logger  A logger.
+     * @param Horde_Log_Logger             $logger     A logger.
      * @param array                        $params     Additional parameters.
      */
     public function __construct(Horde_Kolab_Storage_Driver $master,

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cached.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Cached.php
@@ -51,13 +51,20 @@ protected function _createData($folder,
                                    $object_type = null,
                                    $data_version = 1)
     {
-        return new Horde_Kolab_Storage_Data_Cached(
+        $data = new Horde_Kolab_Storage_Data_Cached(
             $folder,
             $master,
             $factory,
             $this->_cache,
             $object_type,
             $data_version
         );
+
+        if (!empty($this->_logger)) {
+            return new Horde_Kolab_Storage_Data_Decorator_Log(
+                $data, $this->_logger);
+        }
+
+        return $data;
     }
 }
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Cached.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Cached.php
@@ -42,6 +42,13 @@ class Horde_Kolab_Storage_Data_Cached
      */
     private $_init = false;
 
+    /**
+     * Logger instance, or stub.
+     *
+     * @var Horde_Log_Logger | Horde_Support_Stub
+     */
+    protected $_logger;
+
     /**
      * Constructor.
      *

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Decorator/Log.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Decorator/Log.php
@@ -40,7 +40,7 @@ class Horde_Kolab_Storage_Data_Decorator_Log
      *
      * @var mixed
      */
-    private $_logger;
+    protected $_logger;
 
     /**
      * Constructor.

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Uncached.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Uncached.php
@@ -66,13 +66,20 @@ protected function _createData($folder,
                                    $object_type = null,
                                    $data_version = 1)
     {
-        return new Horde_Kolab_Storage_Data_Base(
+        $data = new Horde_Kolab_Storage_Data_Base(
             $folder,
             $master,
             $factory,
             $object_type,
             $data_version
         );
+
+        if (!empty($this->_logger)) {
+            return new Horde_Kolab_Storage_Data_Decorator_Log(
+                $data, $this->_logger);
+        }
+
+        return $data;
     }
 
 }