Merge pull request #12303 from totten/master-redis-errmsg

(dev/core#178) Redis - Report error messages
civicrm · Jun 14, 2018 · b782c36 · b782c36
2 parents 412f2d1 + aed6cc2
commit b782c36
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CRM/Utils/Cache/Redis.php b/CRM/Utils/Cache/Redis.php
@@ -119,7 +119,13 @@ public function __construct($config) {
    */
   public function set($key, &$value) {
     if (!$this->_cache->set($this->_prefix . $key, serialize($value), $this->_timeout)) {
-      CRM_Core_Error::fatal("Redis set failed, wondering why?, $key", $value);
+      if (PHP_SAPI === 'cli' || (Civi\Core\Container::isContainerBooted() && CRM_Core_Permission::check('view debug output'))) {
+        CRM_Core_Error::fatal("Redis set ($key) failed: " . $this->_cache->getLastError());
+      }
+      else {
+        Civi::log()->error("Redis set ($key) failed: " . $this->_cache->getLastError());
+        CRM_Core_Error::fatal("Redis set ($key) failed");
+      }
       return FALSE;
     }
     return TRUE;