Don't print duplicate messages on SystemExit

Don't log the error using LOG.error or LOG.exception and then
passing the same string to SystemExit since this will result in the
error being logged twice. Instead log the error and raise SystemExit(1).

Change-Id: I88b6632e6596a36a7168155dd4219e7d55078621
This commit is contained in:
Joe Gordon 2014-04-29 15:22:20 -07:00
parent 103868ac9b
commit 31a93841ed
6 changed files with 9 additions and 9 deletions

View File

@ -206,7 +206,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
msg = _("Error importing interface driver " msg = _("Error importing interface driver "
"'%s'") % self.conf.interface_driver "'%s'") % self.conf.interface_driver
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
self.context = context.get_admin_context_without_session() self.context = context.get_admin_context_without_session()
self.plugin_rpc = L3PluginApi(topics.L3PLUGIN, host) self.plugin_rpc = L3PluginApi(topics.L3PLUGIN, host)
@ -233,12 +233,12 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
if not self.conf.interface_driver: if not self.conf.interface_driver:
msg = _('An interface driver must be specified') msg = _('An interface driver must be specified')
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
if not self.conf.use_namespaces and not self.conf.router_id: if not self.conf.use_namespaces and not self.conf.router_id:
msg = _('Router id is required if not using namespaces.') msg = _('Router id is required if not using namespaces.')
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
def _cleanup_namespaces(self, routers): def _cleanup_namespaces(self, routers):
"""Destroy stale router namespaces on host when L3 agent restarts """Destroy stale router namespaces on host when L3 agent restarts

View File

@ -677,7 +677,7 @@ class DeviceManager(object):
if not conf.interface_driver: if not conf.interface_driver:
msg = _('An interface driver must be specified') msg = _('An interface driver must be specified')
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
try: try:
self.driver = importutils.import_object( self.driver = importutils.import_object(
conf.interface_driver, conf) conf.interface_driver, conf)
@ -686,7 +686,7 @@ class DeviceManager(object):
"%(inner)s") % {'driver': conf.interface_driver, "%(inner)s") % {'driver': conf.interface_driver,
'inner': e}) 'inner': e})
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
def get_interface_name(self, network, port): def get_interface_name(self, network, port):
"""Return interface(device) name for use by the DHCP process.""" """Return interface(device) name for use by the DHCP process."""

View File

@ -65,7 +65,7 @@ class TypeManager(stevedore.named.NamedExtensionManager):
msg = _("No type driver for tenant network_type: %s. " msg = _("No type driver for tenant network_type: %s. "
"Service terminated!") % network_type "Service terminated!") % network_type
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
LOG.info(_("Tenant network_types: %s"), self.tenant_network_types) LOG.info(_("Tenant network_types: %s"), self.tenant_network_types)
def initialize(self): def initialize(self):

View File

@ -32,7 +32,7 @@ class EswitchUtils(object):
msg = _("Failed to import eventlet.green.zmq. " msg = _("Failed to import eventlet.green.zmq. "
"Won't connect to eSwitchD - exiting...") "Won't connect to eSwitchD - exiting...")
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
self.__conn = None self.__conn = None
self.daemon = daemon_endpoint self.daemon = daemon_endpoint
self.timeout = timeout self.timeout = timeout

View File

@ -82,7 +82,7 @@ class LoadBalancerPlugin(ldb.LoadBalancerPluginDb,
msg = _("Delete associated loadbalancer pools before " msg = _("Delete associated loadbalancer pools before "
"removing providers %s") % list(lost_providers) "removing providers %s") % list(lost_providers)
LOG.exception(msg) LOG.exception(msg)
raise SystemExit(msg) raise SystemExit(1)
def _get_driver_for_provider(self, provider): def _get_driver_for_provider(self, provider):
if provider in self.drivers: if provider in self.drivers:

View File

@ -72,7 +72,7 @@ def load_drivers(service_type, plugin):
msg = (_("No providers specified for '%s' service, exiting") % msg = (_("No providers specified for '%s' service, exiting") %
service_type) service_type)
LOG.error(msg) LOG.error(msg)
raise SystemExit(msg) raise SystemExit(1)
drivers = {} drivers = {}
for provider in providers: for provider in providers: