keys and users work when openstack is disabled or unavailable

[plstackapi.git] / plstackapi / plstackapi-debug-server.py

diff --git a/plstackapi/plstackapi-debug-server.py b/plstackapi/plstackapi-debug-server.py
index 0b3ca47..56542bf 100644 (file)
--- a/plstackapi/plstackapi-debug-server.py
+++ b/plstackapi/plstackapi-debug-server.py
@@ -1,20 +1,29 @@
 #!/usr/bin/env python
 import os
 import sys
-import thread
+import threading
 
 from plstackapi.planetstack.config import Config 
 from plstackapi.openstack.sliveragent import SliverAgent
+from plstackapi.openstack.siteagent import SiteAgent
 
 if __name__ == '__main__':
 
+    # bootstrap envirnment
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plstackapi.planetstack.settings")
     from django.core.management import ManagementUtility
     config = Config()
     url = "%s:%s" % (config.api_host, config.api_port)
     args = [__file__, 'runserver', url] 
-    server = ManagementUtility(args)
+
+    # run site agent once on startup
+    SiteAgent().run()    
+    
+    # start the sliver agent thread
     sliver_agent = SliverAgent()
-    thread.start_new_thread(server.execute, ())
-    thread.start_new_thread(sliver_agent.run, ())
-    #server.execute()
+    sliver_agent_thread = threading.Thread(target=sliver_agent.run)
+    sliver_agent_thread.start()
+
+    # start the server
+    server = ManagementUtility(args)
+    server.execute()