Create db entry for manage Openflow controllers

[osm/openvim.git] / openvimd.py

diff --git a/openvimd.py b/openvimd.py
index be5d46e..923ad16 100755 (executable)
--- a/openvimd.py
+++ b/openvimd.py
@@ -28,11 +28,11 @@ and launches the rest of threads: http clients, openflow controller
 and host controllers  
 '''
 
-__author__="Alfonso Tierno"
-__date__ ="$10-jul-2014 12:07:15$"
-__version__="0.5.3-r520"
-version_date="Jan 2017"
-database_version="0.10"      #expected database schema version
+__author__ = "Alfonso Tierno"
+__date__ = "$10-jul-2014 12:07:15$"
+__version__ = "0.5.5-r522"
+version_date = "Feb 2017"
+database_version = "0.12"      #expected database schema version
 
 import httpserver
 import auxiliary_functions as af
@@ -171,6 +171,9 @@ if __name__=="__main__":
 
     
     engine = None
+    http_thread = None
+    http_thread_admin = None
+
     try:
         #Load configuration file
         r, config_dic = load_configuration(config_file)
@@ -269,6 +272,10 @@ if __name__=="__main__":
     logger.info('Exiting openvimd')
     if engine:
         engine.stop_service()
+    if http_thread:
+        http_thread.join(1)
+    if http_thread_admin:
+        http_thread_admin.join(1)
 
     logger.debug( "bye!")
     exit()