From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 23 Nov 2014 20:01:03 +0000 (+0000)
Subject: Merge "Enforce log hints in neutron.services.metering"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=08aa76d02b2fe70ec3838d9ebfe53797038b4914;p=openstack-build%2Fneutron-build.git

Merge "Enforce log hints in neutron.services.metering"
---

08aa76d02b2fe70ec3838d9ebfe53797038b4914
diff --cc neutron/services/metering/agents/metering_agent.py
index 168af42cb,d4229d583..75eca17cc
--- a/neutron/services/metering/agents/metering_agent.py
+++ b/neutron/services/metering/agents/metering_agent.py
@@@ -49,11 -52,12 +50,11 @@@ class MeteringPluginRpc(object)
  
      def _get_sync_data_metering(self, context):
          try:
 -            return self.call(context,
 -                             self.make_msg('get_sync_data_metering',
 -                                           host=self.host),
 -                             topic=topics.METERING_PLUGIN)
 +            cctxt = self.client.prepare()
 +            return cctxt.call(context, 'get_sync_data_metering',
 +                              host=self.host)
          except Exception:
-             LOG.exception(_("Failed synchronizing routers"))
+             LOG.exception(_LE("Failed synchronizing routers"))
  
  
  class MeteringAgent(MeteringPluginRpc, manager.Manager):