Use log.warning() instead of log.warn()
warn() is provided by ContextAdapter, there's no reason to use it.
This commit is contained in:
		@@ -113,10 +113,11 @@ class _CallContext(object):
 | 
			
		||||
        locks_held = self.check_for_lock(self.conf)
 | 
			
		||||
        if locks_held:
 | 
			
		||||
            stack = ' :: '.join([frame[3] for frame in inspect.stack()])
 | 
			
		||||
            _LOG.warn('An RPC is being made while holding a lock. The locks '
 | 
			
		||||
                      'currently held are %(locks)s. This is probably a bug. '
 | 
			
		||||
                      'Please report it. Include the following: [%(stack)s].',
 | 
			
		||||
                      {'locks': locks_held, 'stack': stack})
 | 
			
		||||
            _LOG.warning('An RPC is being made while holding a lock. The '
 | 
			
		||||
                         'locks currently held are %(locks)s. This is '
 | 
			
		||||
                         'probably a bug. Please report it. Include the '
 | 
			
		||||
                         'following: [%(stack)s].',
 | 
			
		||||
                         {'locks': locks_held, 'stack': stack})
 | 
			
		||||
 | 
			
		||||
    def call(self, ctxt, method, **kwargs):
 | 
			
		||||
        """Invoke a method and wait for a reply. See RPCClient.call()."""
 | 
			
		||||
 
 | 
			
		||||
@@ -523,7 +523,7 @@ class TestCheckForLock(test_utils.BaseTestCase):
 | 
			
		||||
                a = a[0]
 | 
			
		||||
            warnings.append(msg % a)
 | 
			
		||||
 | 
			
		||||
        self.stubs.Set(rpc_client._LOG, 'warn', stub_warn)
 | 
			
		||||
        self.stubs.Set(rpc_client._LOG, 'warning', stub_warn)
 | 
			
		||||
 | 
			
		||||
        client.call({}, 'foo')
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user