Use oslo_utils reflection to get 'f' callable name

Using the utility function gets a better name.

For example:

$ python

>>> from oslo_utils import reflection
>>> class A(object):
...   def m(self):
...     pass
... 
>>> z = A()
>>> reflection.get_callable_name(z.m)
'__main__.A.m'

Versus:

>>> z.m.__name__
'm'

Change-Id: I2daadd969383aaf49ad87876ba108dd80dd56f08

1 files changed, 5 insertions, 2 deletions

diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py
index 0155dcb..fc0665e 100644
--- a/oslo_concurrency/lockutils.py
+++ b/oslo_concurrency/lockutils.py
@@ -26,6 +26,7 @@ import weakref
 
 import fasteners
 from oslo_config import cfg
+from oslo_utils import reflection
 from oslo_utils import timeutils
 import six
 
@@ -247,7 +248,8 @@ def synchronized(name, lock_file_prefix=None, external=False, lock_path=None,
                     t2 = timeutils.now()
                     LOG.debug('Lock "%(name)s" acquired by "%(function)s" :: '
                               'waited %(wait_secs)0.3fs',
-                              {'name': name, 'function': f.__name__,
+                              {'name': name,
+                               'function': reflection.get_callable_name(f),
                                'wait_secs': (t2 - t1)})
                     return f(*args, **kwargs)
             finally:
@@ -258,7 +260,8 @@ def synchronized(name, lock_file_prefix=None, external=False, lock_path=None,
                     held_secs = "%0.3fs" % (t3 - t2)
                 LOG.debug('Lock "%(name)s" released by "%(function)s" :: held '
                           '%(held_secs)s',
-                          {'name': name, 'function': f.__name__,
+                          {'name': name,
+                           'function': reflection.get_callable_name(f),
                            'held_secs': held_secs})
         return inner