Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / core / models / plcorebase.py

diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index 08e4047..b64df5f 100644 (file)
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -1,8 +1,8 @@
 import os
 from django.db import models
 from django.forms.models import model_to_dict
-from observer.event_manager import EventSender
-
+# This is a no-op if observer_disabled is set to 1 in the config file
+from observer import *
 
 class PlCoreBase(models.Model):
 
@@ -39,13 +39,14 @@ class PlCoreBase(models.Model):
     def delete(self, *args, **kwds):
         super(PlCoreBase, self).delete(*args, **kwds)
 
-        EventSender().fire({'delete_flag':True,'model':self.__name__})
+        # This is a no-op if observer_disabled is set
+        notify_observer(model=self, delete=True)
 
     def save(self, *args, **kwargs):
         super(PlCoreBase, self).save(*args, **kwargs)
         
-        # Tell the observer that the source database has been updated
-        EventSender().fire()
+        # This is a no-op if observer_disabled is set
+        notify_observer()
 
         self.__initial = self._dict