openstack/nova
Code Issues Proposed changes

Refactor logging_error into utils

Browse Source 
update: pep8, and fixing log output.
update2: more pep8, I'm looking at you vim
update3: more formating
update4: mailmap
update5: more pep8

Change-Id: I38617e14260e65ed5cb81b3554479d3720850aae
This commit is contained in:
Aaron Lee 2011-11-08 20:23:14 -06:00 committed by Aaron Lee
parent 0086109850
commit 98d30423b3
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -1,6 +1,7 @@
# Format is: # Format is:
# <preferred e-mail> <other e-mail 1> # <preferred e-mail> <other e-mail 1>
# <preferred e-mail> <other e-mail 2> # <preferred e-mail> <other e-mail 2>
<aaron.lee@rackspace.com> <wwkeyboard@gmail.com>
<anotherjesse@gmail.com> <jesse@dancelamb> <anotherjesse@gmail.com> <jesse@dancelamb>
<anotherjesse@gmail.com> <jesse@gigantor.local> <anotherjesse@gmail.com> <jesse@gigantor.local>
<anotherjesse@gmail.com> <jesse@ubuntu> <anotherjesse@gmail.com> <jesse@ubuntu>

20
nova/compute/manager.py
View File

@ -409,14 +409,9 @@ class ComputeManager(manager.SchedulerDependentManager):
if network_info is not None: if network_info is not None:
_deallocate_network() _deallocate_network()
@contextlib.contextmanager def _error_message(instance_id, message):
def _logging_error(instance_id, message): return _("Instance '%(instance_id)s' "
try: "failed %(message)s.") % locals()
yield
except Exception as error:
with utils.save_and_reraise_exception():
LOG.exception(_("Instance '%(instance_id)s' "
"failed %(message)s.") % locals())
context = context.elevated() context = context.elevated()
instance = self.db.instance_get(context, instance_id) instance = self.db.instance_get(context, instance_id)
@ -444,14 +439,16 @@ class ComputeManager(manager.SchedulerDependentManager):
is_vpn = instance['image_ref'] == str(FLAGS.vpn_image_id) is_vpn = instance['image_ref'] == str(FLAGS.vpn_image_id)
try: try:
network_info = None network_info = None
with _logging_error(instance_id, "network setup"): with utils.logging_error(_error_message(instance_id,
"network setup")):
network_info = _make_network_info() network_info = _make_network_info()
self._instance_update(context, self._instance_update(context,
instance_id, instance_id,
vm_state=vm_states.BUILDING, vm_state=vm_states.BUILDING,
task_state=task_states.BLOCK_DEVICE_MAPPING) task_state=task_states.BLOCK_DEVICE_MAPPING)
with _logging_error(instance_id, "block device setup"): with utils.logging_error(_error_message(instance_id,
"block device setup")):
block_device_info = _make_block_device_info() block_device_info = _make_block_device_info()
self._instance_update(context, self._instance_update(context,
@ -460,7 +457,8 @@ class ComputeManager(manager.SchedulerDependentManager):
task_state=task_states.SPAWNING) task_state=task_states.SPAWNING)
# TODO(vish) check to make sure the availability zone matches # TODO(vish) check to make sure the availability zone matches
with _logging_error(instance_id, "failed to spawn"): with utils.logging_error(_error_message(instance_id,
"failed to spawn")):
self.driver.spawn(context, instance, image_meta, self.driver.spawn(context, instance, image_meta,
network_info, block_device_info) network_info, block_device_info)

13
nova/utils.py
View File

@ -1002,6 +1002,19 @@ def save_and_reraise_exception():
raise type_, value, traceback raise type_, value, traceback
@contextlib.contextmanager
def logging_error(message):
"""Catches exception, write message to the log, re-raise.
This is a common refinement of save_and_reraise that writes a specific
message to the log.
"""
try:
yield
except Exception as error:
with save_and_reraise_exception():
LOG.exception(message)
def make_dev_path(dev, partition=None, base='/dev'): def make_dev_path(dev, partition=None, base='/dev'):
"""Return a path to a particular device. """Return a path to a particular device.