Merge "use LOG instead of logger as name for the Logger object"

This commit is contained in:
Jenkins 2014-06-11 06:44:41 +00:00 committed by Gerrit Code Review
commit c6dcc20a32

View File

@ -25,11 +25,11 @@ from ceilometer.openstack.common import log
from ceilometer.openstack.common import timeutils
from ceilometer import sample
LOG = log.getLogger(__name__)
class FloatingIPPollster(plugin.CentralPollster):
LOG = log.getLogger(__name__ + '.floatingip')
def _get_floating_ips(self):
nv = nova_client.Client()
return nv.floating_ip_get_all()
@ -41,7 +41,7 @@ class FloatingIPPollster(plugin.CentralPollster):
def get_samples(self, manager, cache, resources=None):
for ip in self._iter_floating_ips(cache):
self.LOG.info(_("FLOATING IP USAGE: %s") % ip.ip)
LOG.info(_("FLOATING IP USAGE: %s") % ip.ip)
# FIXME (flwang) Now Nova API /os-floating-ips can't provide those
# attributes were used by Ceilometer, such as project id, host.
# In this fix, those attributes usage will be removed temporarily.