Reverted model policies to non-parallel version

[plstackapi.git] / planetstack / model_policy.py

diff --git a/planetstack/model_policy.py b/planetstack/model_policy.py
index 38cc4df..7aef793 100644 (file)
--- a/planetstack/model_policy.py
+++ b/planetstack/model_policy.py
@@ -4,6 +4,8 @@ import pdb
 from core.models import *
 from dependency_walker import *
 import model_policies
+from util.logger import logger
+
 
 modelPolicyEnabled = True
 
@@ -12,32 +14,48 @@ def EnableModelPolicy(x):
     modelPolicyEnabled = x
 
 def update_dep(d, o):
-       if (d.updated < o.updated):
-               d.save(update_fields=['updated'])
+       try:
+               if (d.updated < o.updated):
+                       d.save(update_fields=['updated'])
+       except AttributeError,e:
+               raise e
        
 def delete_if_inactive(d, o):
        #print "Deleting %s (%s)"%(d,d.__class__.__name__)
        d.delete()      
        return
 
-@receiver(post_save)
-def post_save_handler(sender, instance, **kwargs):
-        if not modelPolicyEnabled:
-            return
-
-       sender_name = sender.__name__
-       policy_name = 'model_policy_%s'%sender_name
-       
-       if (not kwargs['update_fields']):
+def execute_model_policy(policy_name, instance, update_fields_empty, deleted):
+       if (update_fields_empty):
                # Automatic dirtying
-               walk_inv_deps(update_dep, instance)
+               #walk_inv_deps(update_dep, instance)
 
                try:
                        policy_handler = getattr(model_policies, policy_name, None)
+                        logger.error("POLICY HANDLER: %s %s" % (policy_name, policy_handler))                       
                        if policy_handler is not None:
                                policy_handler.handle(instance)
                except:
-                       pass
-       elif 'deleted' in kwargs['update_fields']:
+                       logger.log_exc("Model Policy Error:") 
+                       print "Policy Exceution Error"
+       elif deleted:
                walk_inv_deps(delete_if_inactive, instance)
+
+
+@receiver(post_save)
+def post_save_handler(sender, instance, **kwargs):
+        if not modelPolicyEnabled:
+            return
+
+       sender_name = sender.__name__
+       policy_name = 'model_policy_%s'%sender_name
+        if (not kwargs['update_fields']):
+               noargs = True
+               deleted = False
+       else:
+               noargs = False
+               deleted = True
+
+       execute_model_policy(policy_name, instance, noargs, deleted)
+