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

[plstackapi.git] / planetstack / observer / syncstep.py

diff --git a/planetstack/observer/syncstep.py b/planetstack/observer/syncstep.py
index c8d3e42..fc0cb0b 100644 (file)
--- a/planetstack/observer/syncstep.py
+++ b/planetstack/observer/syncstep.py
@@ -1,6 +1,11 @@
 import os
 import base64
+from datetime import datetime
 from planetstack.config import Config
+from util.logger import Logger, logging
+from observer.steps import *
+
+logger = Logger(level=logging.INFO)
 
 class FailedDependency(Exception):
     pass
@@ -29,6 +34,8 @@ class SyncStep:
         """
         dependencies = []
         self.driver = args.get('driver')
+        self.error_map = args.get('error_map')
+
         try:
             self.soft_deadline = int(self.get_prop('soft_deadline_seconds'))
         except:
@@ -36,27 +43,43 @@ class SyncStep:
 
         return
 
-    def fetch_pending(self):
-        return Sliver.objects.filter(ip=None)
+    def fetch_pending(self, deletion=False):
+        return []
+        #return Sliver.objects.filter(ip=None)
     
-    def check_dependencies(self, obj):
+    def check_dependencies(self, obj, failed):
         for dep in self.dependencies:
-            peer_object = getattr(obj, dep.name.lowercase())
-            if (peer_object.pk==dep.pk):
-                raise DependencyFailed
+            peer_name = dep[0].lower() + dep[1:]    # django names are camelCased with the first letter lower
+            peer_object = getattr(obj, peer_name)
+            if (peer_object.pk==failed.pk):
+                raise FailedDependency
 
-    def call(self, failed=[]):
-        pending = self.fetch_pending()
+    def call(self, failed=[], deletion=False):
+        pending = self.fetch_pending(deletion)
         for o in pending:
-            if (not self.depends_on(o, failed)):
-                try:
-                    check_dependencies(o) # Raises exception if failed                    
+            try:
+                for f in failed:
+                    self.check_dependencies(o,f) # Raises exception if failed
+                if (deletion):
+                    self.delete_record(o)
+                    o.delete(purge=True)
+                else:
                     self.sync_record(o)
                     o.enacted = datetime.now() # Is this the same timezone? XXX
+                    o.backend_status = "OK"
                     o.save(update_fields=['enacted'])
+            except Exception,e:
+                try:
+                    o.backend_status = self.error_map.map(str(e))
                 except:
-                    failed.append(o)
+                    o.backend_status = str(e)
+
+                o.save(update_fields=['backend_status'])
+
+                logger.log_exc("sync step failed!")
+                failed.append(o)
+
         return failed
 
-    def __call__(self):
-        return self.call()
+    def __call__(self, **args):
+        return self.call(**args)