# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-08-06 21:25:23
# Node ID 21c6c3941e7265b034e5dc7a9c0c7e96faceccc3
# Parent  193b4eb7ffc0a97b0775150b3afde572f03c6860

cache: fix overwrite of flock timeout, and improve logging.

diff --git a/rhodecode/lib/rc_cache/backends.py b/rhodecode/lib/rc_cache/backends.py
--- a/rhodecode/lib/rc_cache/backends.py
+++ b/rhodecode/lib/rc_cache/backends.py
@@ -108,11 +108,13 @@ class CustomLockFactory(FileLock):
                         raise
                     elif (time.time() - start_lock_time) > timeout:
                         # waited to much time on a lock, better fail than loop for ever
-                        log.error('Failed to acquire lock on %s file', self.filename)
+                        log.error('Failed to acquire lock on `%s` after waiting %ss',
+                                  self.filename, timeout)
                         raise
-                    timeout = 0.03
-                    log.debug('Failed to acquire lock, retry in %ss', timeout)
-                    gevent.sleep(timeout)
+                    wait_timeout = 0.03
+                    log.debug('Failed to acquire lock on `%s`, retry in %ss',
+                              self.filename, wait_timeout)
+                    gevent.sleep(wait_timeout)
 
         fcntl.flock = gevent_flock
         return fcntl