summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-02-17 16:16:04 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-02-17 16:48:20 +0000
commit26a5594cdbb1c399703ee94faa5648d2eba8feae (patch)
treef2a04cb5634c7540fd34f45fe9283f3e7444361d
parent196da29bb222ba151a4bbdbf26ebab548824f1e1 (diff)
downloadnova-26a5594cdbb1c399703ee94faa5648d2eba8feae.tar.gz
nova-26a5594cdbb1c399703ee94faa5648d2eba8feae.tar.xz
nova-26a5594cdbb1c399703ee94faa5648d2eba8feae.zip
LOG.exception does not take an exc_info keyword
It will automatically call sys.exc_info() anyway Change-Id: I6a279bb18d913938d933a486e42a3be38bfaccb4
-rw-r--r--nova/virt/xenapi/vmops.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index a8a78a073..8ee34aaa7 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -25,7 +25,6 @@ import json
import os
import pickle
import random
-import sys
import time
import uuid
@@ -245,7 +244,7 @@ class VMOps(object):
except (self.XenAPI.Failure, OSError, IOError) as spawn_error:
LOG.exception(_("instance %s: Failed to spawn"),
- instance.uuid, exc_info=sys.exc_info())
+ instance.uuid)
LOG.debug(_('Instance %s failed to spawn - performing clean-up'),
instance.id)
self._handle_spawn_error(vdis, spawn_error)
@@ -320,9 +319,9 @@ class VMOps(object):
except (self.XenAPI.Failure, OSError, IOError) as vm_create_error:
# Collect VDI/file resources to clean up;
# These resources will be removed by _handle_spawn_error.
- LOG.exception(_("instance %s: Failed to spawn - " +
+ LOG.exception(_("instance %s: Failed to spawn - "
"Unable to create VM"),
- instance.id, exc_info=sys.exc_info())
+ instance.uuid)
last_arg = None
resources = []
@@ -1410,8 +1409,7 @@ class VMOps(object):
start_time,
stop_time)
except exception.CouldNotFetchMetrics:
- LOG.exception(_("Could not get bandwidth info."),
- exc_info=sys.exc_info())
+ LOG.exception(_("Could not get bandwidth info."))
return {}
bw = {}
for uuid, data in metrics.iteritems():