Replace all the 'self.log' calls with global LOG

Change-Id: Iae917e1139c8c95a1bad5466df8a607656b9de5c
This commit is contained in:
Zhenguo Niu
2016-02-19 11:30:46 +08:00
parent 3bcda73ca0
commit 7fe40bb559
3 changed files with 14 additions and 17 deletions
ironic_python_agent

@ -42,7 +42,6 @@ class APIClient(object):
self.session.mount(self.api_url, adapter)
self.encoder = encoding.RESTJSONEncoder()
self.log = log.getLogger(__name__)
def _request(self, method, path, data=None):
request_url = '{api_url}{path}'.format(api_url=self.api_url, path=path)
@ -114,28 +113,26 @@ class APIClient(object):
try:
response = self._request('POST', path, data=data)
except Exception as e:
self.log.warning('POST failed: %s' % str(e))
LOG.warning('POST failed: %s' % str(e))
return False
if response.status_code != requests.codes.OK:
self.log.warning('Invalid status code: %s' % response.status_code)
LOG.warning('Invalid status code: %s' % response.status_code)
return False
try:
content = json.loads(response.content)
except Exception as e:
self.log.warning('Error decoding response: %s' % str(e))
LOG.warning('Error decoding response: %s' % str(e))
return False
# Check for valid response data
if 'node' not in content or 'uuid' not in content['node']:
self.log.warning('Got invalid node data from the API: %s' %
content)
LOG.warning('Got invalid node data from the API: %s' % content)
return False
if 'heartbeat_timeout' not in content:
self.log.warning('Got invalid heartbeat from the API: %s' %
content)
LOG.warning('Got invalid heartbeat from the API: %s' % content)
return False
# Got valid content