merge from head.

[nodemanager.git] / database.py

diff --git a/database.py b/database.py
index 878a7ba..be304d3 100644 (file)
--- a/database.py
+++ b/database.py
@@ -102,9 +102,11 @@ class Database(dict):
             if name not in self: accounts.get(name).ensure_destroyed()
         for name, rec in self.iteritems():
             if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
+            if rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
 
-        bwmon.GetSlivers(self)
-
+        #try: bwmon.GetSlivers(self)
+        #except: logger.log_exc()
+        bwmon.lock.set()
         # request a database dump
         global dump_requested
         dump_requested = True