From fd49ea7e0099ea51b1d533d4b72b1b0ba48f130c Mon Sep 17 00:00:00 2001
From: Guba Sándor <guba.sandor@cloud.bme.hu>
Date: Sun, 9 Feb 2014 14:14:36 +0100
Subject: [PATCH] vm: fix TimeLimitExceeded exception's name
---
circle/vm/models/instance.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/circle/vm/models/instance.py b/circle/vm/models/instance.py
index 2826bd0..f1db805 100644
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
@@ -15,7 +15,7 @@ from django.dispatch import Signal
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
-from celery.exceptions import TimeoutError
+from celery.exceptions import TimeLimitExceeded
from model_utils.models import TimeStampedModel
from taggit.managers import TaggableManager
@@ -775,7 +775,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
raise self.WrongStateError(self)
def __on_abort(activity, error):
- if isinstance(error, TimeoutError):
+ if isinstance(error, TimeLimitExceeded):
activity.resultant_state = None
else:
activity.resultant_state = 'ERROR'
@@ -826,7 +826,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
"""Shutdown virtual machine with ACPI signal.
"""
def __on_abort(activity, error):
- if isinstance(error, TimeoutError):
+ if isinstance(error, TimeLimitExceeded):
activity.resultant_state = None
else:
activity.resultant_state = 'ERROR'
@@ -841,6 +841,9 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
queue_name = self.get_remote_queue_name('vm')
vm_tasks.shutdown.apply_async(args=[self.vm_name],
queue=queue_name).get()
+ self.node = None
+ self.vnc_port = None
+ self.save()
def shutdown_async(self, user=None):
"""Execute shutdown asynchronously.
--
libgit2 0.26.0