Andrew Bogott has submitted this change and it was merged.
Change subject: Swallow unexpected exceptions when creating/deleting messages.
......................................................................
Swallow unexpected exceptions when creating/deleting messages.
Designate is lame; it doesn't log exceptions but it /does/ interrupt
execution of other things when they're thrown.
Change-Id: Ic356e500931b2aa35fa9bd5d9b6b1f38f9ecac1b
---
M nova_fixed_multi/novamulti.py
M setup.py
2 files changed, 18 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
diff --git a/nova_fixed_multi/novamulti.py b/nova_fixed_multi/novamulti.py
index 18a95eb..02c4530 100644
--- a/nova_fixed_multi/novamulti.py
+++ b/nova_fixed_multi/novamulti.py
@@ -21,6 +21,8 @@
from designate.openstack.common import log as logging
from nova_fixed_multi.base import BaseAddressMultiHandler
+import sys
+
LOG = logging.getLogger(__name__)
cfg.CONF.register_group(cfg.OptGroup(
@@ -60,12 +62,22 @@
LOG.debug('NovaFixedHandler received notification - %s' % event_type)
if event_type == 'compute.instance.create.end':
- self._create(payload['fixed_ips'], payload,
- resource_id=payload['instance_id'],
- resource_type='instance')
+ try:
+ self._create(payload['fixed_ips'], payload,
+ resource_id=payload['instance_id'],
+ resource_type='instance')
+ except:
+ LOG.debug("-------------------- Unexpected error: %s" %
+ sys.exc_info()[0])
+ LOG.debug("-------------------- (swallowed)")
elif event_type == 'compute.instance.delete.start':
- self._delete(resource_id=payload['instance_id'],
- resource_type='instance')
+ try:
+ self._delete(resource_id=payload['instance_id'],
+ resource_type='instance')
+ except:
+ LOG.debug("-------------------- Unexpected error: %s" %
+ sys.exc_info()[0])
+ LOG.debug("-------------------- (swallowed)")
else:
raise ValueError('NovaFixedHandler received an invalid event type')
diff --git a/setup.py b/setup.py
index 90310af..71d8172 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
setuptools.setup(
name="nova_fixed_multi",
- version="2015.3",
+ version="2015.6",
author="Wikimedia Foundation",
author_email="abog...@wikimedia.org",
description="Designate sink handler that supports multiple arecords per
instance",
--
To view, visit https://gerrit.wikimedia.org/r/219103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic356e500931b2aa35fa9bd5d9b6b1f38f9ecac1b
Gerrit-PatchSet: 1
Gerrit-Project: sink_nova_fixed_multi
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
