INT-16722: Disabled logging for redislock for web.

Resolves #11

Author: David Castro

README.md

@@ -19,8 +19,8 @@ Set:
 
 ## Flags
 
-* Use the boolean flag `$CFG->local_redislock_logging` to control whether verbose
-logging should be emitted. If not set, logging is automatically-enabled when running
-in the CLI environment with debugging enabled on `DEBUG_NORMAL` level at least.
+* Logging is only available in the CLI environment with debugging enabled on `DEBUG_NORMAL` level at least.
+Use the boolean flag `$CFG->local_redislock_logging` to control whether verbose
+logging should be emitted. If not set, logging is automatically-enabled.
 * Use the boolean flag `$CFG->local_redislock_disable_shared_connection` to force creation
 of the redis connection for each factory instance.

classes/api/shared_redis_connection.php

@@ -65,10 +65,10 @@ class shared_redis_connection {
      */
     private function __construct() {
         $this->factorycount = 0;
+        // Logging enabled only for CLI, web gets damaged by lock logs.
+        $this->logging = (CLI_SCRIPT && debugging() && !PHPUNIT_TEST);
         if (isset($CFG->local_redislock_logging)) {
-            $this->logging = (bool) $CFG->local_redislock_logging;
-        } else {
-            $this->logging = (CLI_SCRIPT && debugging() && !PHPUNIT_TEST);
+            $this->logging = $this->logging && ((bool) $CFG->local_redislock_logging);
         }
     }
 

classes/lock/redis_lock_factory.php

@@ -102,10 +102,10 @@ public function __construct($type, \Redis $redis = null, $logging = null) {
             $this->shareconnection = false;
         }
         if (is_null($logging)) {
+            // Logging enabled only for CLI, web gets damaged by lock logs.
+            $logging = (CLI_SCRIPT && debugging() && !PHPUNIT_TEST);
             if (isset($CFG->local_redislock_logging)) {
-                $logging = (bool) $CFG->local_redislock_logging;
-            } else {
-                $logging = (CLI_SCRIPT && debugging() && !PHPUNIT_TEST);
+                $logging = $this->logging && ((bool) $CFG->local_redislock_logging);
             }
         }
         $this->redis   = $redis;