From: Assaf Muller <amuller@redhat.com>
Date: Wed, 8 Apr 2015 23:13:14 +0000 (-0400)
Subject: Log RPC initialization in L3 service plugin and ML2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a22c6bdc8286e96454d6c8652a7ee5f832ce0952;p=openstack-build%2Fneutron-build.git

Log RPC initialization in L3 service plugin and ML2

Under certain conditions the messaging server may be up but
not responding. In this case the Neutron server will fail to start
silently, making it pretty hard to track down the issue without
looking through a lot of code and adding a bunch of random logging.

Change-Id: I6a562476f2789386a020db7b21b9349c4c58c30c
---

diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index 3f734d9e3..240f3b03c 100644
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -41,6 +41,7 @@ from neutron.callbacks import resources
 from neutron.common import constants as const
 from neutron.common import exceptions as exc
 from neutron.common import ipv6_utils
+from neutron.common import log as neutron_log
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron.common import utils
@@ -156,6 +157,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
             dhcp_rpc_agent_api.DhcpAgentNotifyAPI()
         )
 
+    @neutron_log.log
     def start_rpc_listeners(self):
         self.endpoints = [rpc.RpcCallbacks(self.notifier, self.type_manager),
                           securitygroups_rpc.SecurityGroupServerRpcCallback(),
diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py
index 2b35e9b32..32c30bd47 100644
--- a/neutron/services/l3_router/l3_router_plugin.py
+++ b/neutron/services/l3_router/l3_router_plugin.py
@@ -19,6 +19,7 @@ from oslo_utils import importutils
 from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
 from neutron.api.rpc.handlers import l3_rpc
 from neutron.common import constants as q_const
+from neutron.common import log as neutron_log
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron.db import common_db_mixin
@@ -61,6 +62,7 @@ class L3RouterPlugin(common_db_mixin.CommonDbMixin,
             l3_dvrscheduler_db.subscribe()
         l3_db.subscribe()
 
+    @neutron_log.log
     def setup_rpc(self):
         # RPC support
         self.topic = topics.L3PLUGIN