Skip to content

Gelencsér Szabolcs / circlestack

Go to a project
Commit d48175e1 by Őry Máté
Options

Merge branch 'issue-177' into 'master' 

Issue 177
parents 1ee90a64 3b9457cc
Showing with 3 additions and 5 deletions
circle/vm/models/instance.py
...@@ -648,11 +648,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin, ...@@ -648,11 +648,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
raise Node.DoesNotExist() raise Node.DoesNotExist()
def _is_notified_about_expiration(self): def _is_notified_about_expiration(self):
renews = self.activity_log.filter(activity_code__endswith='renew') last_activity = self.activity_log.latest('pk')
cond = {'activity_code__endswith': 'notification_about_expiration'} return (last_activity.activity_code ==
if len(renews) > 0: 'vm.Instance.notification_about_expiration')
cond['finished__gt'] = renews[0].started
return self.activity_log.filter(**cond).exists()
def notify_owners_about_expiration(self, again=False): def notify_owners_about_expiration(self, again=False):
"""Notify owners about vm expiring soon if they aren't already. """Notify owners about vm expiring soon if they aren't already.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment