Merge remote-tracking branch 'origin/master' into kirkmadera-github-1…

…27-installs-into-app-code-local-Cm-RedisSession-code

README.md

@@ -32,6 +32,12 @@ Be aware that if the `<max_lifetime>` setting is below your Cookie Lifetime, the
 
 ## Installation ##
 
+This extension can be installed with either Composer or modman.
+
+The Magento Compiler feature is currently not supported.
+
+#### Modman Installation ####
+
 1. Install module using [modman](https://github.com/colinmollenhour/modman):
 
         modman clone https://github.com/colinmollenhour/Cm_RedisSession
@@ -75,6 +81,7 @@ Be aware that if the `<max_lifetime>` setting is below your Cookie Lifetime, the
             <disable_locking>0</disable_locking>                 <!-- Disable session locking entirely. -->
             <min_lifetime>60</min_lifetime>                      <!-- Set the minimum session lifetime -->
             <max_lifetime>2592000</max_lifetime>                 <!-- Set the maximum session lifetime -->
+            <log_exceptions>0</log_exceptions>                   <!-- Log connection failure and concurrent connection exceptions in exception.log. -->
         </redis_session>
         ...
     </global>

app/code/local/Cm/RedisSession/Model/Session.php

@@ -50,7 +50,7 @@ class Cm_RedisSession_Model_Session implements \Zend_Session_SaveHandler_Interfa
     /**
      * @var \Cm\RedisSession\Handler
      */
-    private $sessionHandler;
+    protected $sessionHandler;
 
     public function __construct()
     {
@@ -170,10 +170,16 @@ public function gc($maxLifeTime)
      * @param \Exception $e
      * @return void
      */
-    private function handleException(\Exception $e)
+    protected function handleException(\Exception $e)
     {
-        Mage::logException($e);
-        require_once Mage::getBaseDir() . DS . 'errors' . DS . '503.php';
+        if (Mage::getConfig()->getNode('global/redis_session')->is('log_exceptions')) {
+            Mage::logException($e);
+        }
+        if ($e instanceof \Cm\RedisSession\ConcurrentConnectionsExceededException) {
+            require_once Mage::getBaseDir() . DS . 'errors' . DS . '503.php';
+        } else {
+            Mage::printException($e);
+        }
         exit;
     }
 }