removing plural from model names. some cleanup

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

diff --git a/planetstack/openstack_observer/event_loop.py b/planetstack/openstack_observer/event_loop.py
index 9e8c7b4..cdd94a2 100644 (file)
--- a/planetstack/openstack_observer/event_loop.py
+++ b/planetstack/openstack_observer/event_loop.py
@@ -12,6 +12,7 @@ from datetime import datetime
 from collections import defaultdict
 from core.models import *
 from django.db.models import F, Q
+from django.db import connection
 #from openstack.manager import OpenStackManager
 from openstack.driver import OpenStackDriver
 from util.logger import Logger, logging, logger
@@ -49,7 +50,7 @@ def invert_graph(g):
        return ig
 
 class PlanetStackObserver:
-       #sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
+       #sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivilege,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
        sync_steps = []
 
        
@@ -238,6 +239,7 @@ class PlanetStackObserver:
                                raise StepNotReady
 
        def sync(self, S, deletion):
+            try:
                step = self.step_lookup[S]
                start_time=time.time()
 
@@ -252,10 +254,13 @@ class PlanetStackObserver:
                except KeyError:
                        has_deps = False
 
+               go = False
+
                if (has_deps):
                        for d in deps:
                                 if d==step.__name__:
                                     logger.info("   step %s self-wait skipped" % step.__name__)
+                                   go = True
                                     continue
 
                                cond = self.step_conditions[d]
@@ -264,7 +269,7 @@ class PlanetStackObserver:
                                         logger.info("  step %s wait on dep %s" % (step.__name__, d))
                                        cond.wait()
                                cond.release()
-                       go = self.step_status[d] == STEP_STATUS_OK
+                       go = go or self.step_status[d] == STEP_STATUS_OK
                else:
                        go = True
 
@@ -337,6 +342,8 @@ class PlanetStackObserver:
                except KeyError,e:
                        logger.info('Step %r is a leaf' % step)
                        pass
+            finally:
+                connection.close()
 
        def run(self):
                if not self.driver.enabled: