rename config option

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

diff --git a/planetstack/observer/event_loop.py b/planetstack/observer/event_loop.py
index 6dc34da..ee37385 100644 (file)
--- a/planetstack/observer/event_loop.py
+++ b/planetstack/observer/event_loop.py
@@ -22,7 +22,14 @@ logger = Logger(logfile='observer.log', level=logging.INFO)
 class StepNotReady(Exception):
     pass
 
-def toposort(g, steps):
+def toposort(g, steps=None):
+    if (not steps):
+        keys = set(g.keys())
+        values = set({})
+        for v in g.values():
+            values=values | set(v)
+        
+        steps=list(keys|values)
     reverse = {}
 
     for k,v in g.items():
@@ -54,13 +61,15 @@ def toposort(g, steps):
                     marked.append(m)
         except KeyError:
             pass
-        order.append(n)
+        if (n in steps):
+            order.append(n)
 
+    order.reverse()
     order.extend(set(steps)-set(order))
     return order
 
 class PlanetStackObserver:
-    sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,GarbageCollector]
+    sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
 
     def __init__(self):
         # The Condition object that gets signalled by Feefie events
@@ -81,7 +90,7 @@ class PlanetStackObserver:
         self.event_cond.release()
 
     def load_sync_steps(self):
-        dep_path = Config().observer_backend_dependency_graph
+        dep_path = Config().observer_dependency_graph
         try:
             # This contains dependencies between records, not sync steps
             self.model_dependency_graph = json.loads(open(dep_path).read())
@@ -167,7 +176,7 @@ class PlanetStackObserver:
         self.last_run_times[step.__name__]=time.time()
 
     def check_schedule(self, step):
-        time_since_last_run = time.time() - self.last_run_times[step.__name__]
+        time_since_last_run = time.time() - self.last_run_times.get(step.__name__, 0)
         try:
             if (time_since_last_run < step.requested_interval):
                 raise StepNotReady
@@ -185,14 +194,15 @@ class PlanetStackObserver:
                 self.last_run_times[e]=0
 
 
-
     def save_run_times(self):
         run_times = json.dumps(self.last_run_times)
         open('/tmp/observer_run_times','w').write(run_times)
 
     def check_class_dependency(self, step, failed_steps):
+        step.dependenices = []
+        for obj in step.provides:
+            step.dependenices.extend(self.model_dependency_graph.get(obj.__name__, []))
         for failed_step in failed_steps:
-            step.dependencies = self.model_dependency_graph.get(step.provides[0].__name__, [])
             if (failed_step in step.dependencies):
                 raise StepNotReady
 
@@ -246,8 +256,8 @@ class PlanetStackObserver:
                             duration=time.time() - start_time
 
                             # ********* This is the actual sync step
-                            import pdb
-                            pdb.set_trace()
+                            #import pdb
+                            #pdb.set_trace()
                             failed_objects = sync_step(failed=failed_step_objects)