CRM-12856 - CRM_Core_Lock - Quieter logs

The log is very noisy (adding several log lines on most page requests). This
might be useful for debugging lock issues, but that's a developer task, so
we'll only do it if CIVICRM_LOCK_DEBUG is defined.

diff --git a/CRM/Core/Lock.php b/CRM/Core/Lock.php
index a3a4dc9ad04407e355a02d36b9b64cd868177312..c3e306055b031baa6b3f49e95c0e88496a4f40a9 100644 (file)
--- a/CRM/Core/Lock.php
+++ b/CRM/Core/Lock.php
@@ -66,7 +66,9 @@ class CRM_Core_Lock {
     else {
       $this->_name = $database . '.' . $domainID . '.' . $name;
     }
-    CRM_Core_Error::debug_log_message('trying to construct lock for ' . $this->_name);
+    if (defined('CIVICRM_LOCK_DEBUG')) {
+      CRM_Core_Error::debug_log_message('trying to construct lock for ' . $this->_name);
+    }
     static $jobLog = FALSE;
     if ($jobLog && CRM_Core_DAO::singleValueQuery("SELECT IS_USED_LOCK( '{$jobLog}')")) {
       return $this->hackyHandleBrokenCode($jobLog);
@@ -74,7 +76,9 @@ class CRM_Core_Lock {
     if (stristr($name, 'civimail.job.')) {
       $jobLog = $this->_name;
     }
+    //if (defined('CIVICRM_LOCK_DEBUG')) {
     //CRM_Core_Error::debug_var('backtrace', debug_backtrace());
+    //}
     $this->_timeout = $timeout !== NULL ? $timeout : self::TIMEOUT;
 
     $this->acquire();
@@ -85,7 +89,9 @@ class CRM_Core_Lock {
   }
 
   function acquire() {
-    CRM_Core_Error::debug_log_message('aquire lock for ' . $this->_name);
+    if (defined('CIVICRM_LOCK_DEBUG')) {
+      CRM_Core_Error::debug_log_message('acquire lock for ' . $this->_name);
+    }
     if (!$this->_hasLock) {
       $query = "SELECT GET_LOCK( %1, %2 )";
       $params = array(
@@ -137,7 +143,9 @@ class CRM_Core_Lock {
     if (stristr($this->_name, 'job')) {
       throw new CRM_Core_Exception('lock aquisition for ' . $this->_name . 'attempted when ' . $jobLog . 'is not released');
     }
-    CRM_Core_Error::debug_log_message('(CRM-12856) faking lock for ' . $this->_name);
+    if (defined('CIVICRM_LOCK_DEBUG')) {
+      CRM_Core_Error::debug_log_message('(CRM-12856) faking lock for ' . $this->_name);
+    }
     $this->_hasLock = TRUE;
     return TRUE;
   }