From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Fri, 10 Feb 2017 13:52:55 +0000 (+0100)
Subject: minor changes on stopping threads
X-Git-Tag: v2.0.0~54
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=56c0c283e17f3748b3c01beff9691ab43a7ed564;p=osm%2Fopenvim.git

minor changes on stopping threads

Change-Id: I71631de557b5654e3915cee05c34cb6d21088401
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/openvimd.py b/openvimd.py
index be5d46e..3affa56 100755
--- a/openvimd.py
+++ b/openvimd.py
@@ -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()
diff --git a/ovim.py b/ovim.py
index e5cd40d..8c7ba39 100644
--- a/ovim.py
+++ b/ovim.py
@@ -239,9 +239,6 @@ class ovim():
             thread.insert_task("exit")
         for thread in threads.values():
             thread.join()
-            # http_thread.join()
-            # if http_thread_admin is not None:
-            # http_thread_admin.join()
 
 
     def get_ports(self, columns=None, filter={}, limit=None):