Review thread logs, move threads inside qobjects package

Ref #263
Alignak-monitoring-contrib · Mar 6, 2018 · 51c89d5 · 51c89d5
1 parent 4536ad2
commit 51c89d5
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/alignak_app/app.py b/alignak_app/app.py
@@ -47,7 +47,7 @@
 from alignak_app.backend.backend import app_backend
 from alignak_app.backend.datamanager import data_manager
 
-from alignak_app.qthreads.threadmanager import thread_manager, BackendQThread
+from alignak_app.qobjects.threads.threadmanager import thread_manager, BackendQThread
 from alignak_app.qobjects.common.widgets import center_widget
 from alignak_app.qobjects.login.login import LoginQDialog
 from alignak_app.qobjects.dock.events import init_event_widget

diff --git a/alignak_app/qobjects/panel/host.py b/alignak_app/qobjects/panel/host.py
@@ -27,7 +27,7 @@
 
 from logging import getLogger
 
-from PyQt5.Qt import QLabel, QWidget, QGridLayout, Qt, QPixmap, QVBoxLayout, QHBoxLayout
+from PyQt5.Qt import QLabel, QWidget, QGridLayout, Qt, QPixmap, QVBoxLayout
 from PyQt5.Qt import QPushButton, QIcon, QTimer, QScrollArea
 
 from alignak_app.backend.backend import app_backend
@@ -42,7 +42,7 @@
 from alignak_app.qobjects.dock.events import send_event
 from alignak_app.qobjects.panel.history import HistoryQWidget
 
-from alignak_app.qthreads.threadmanager import thread_manager
+from alignak_app.qobjects.threads.threadmanager import thread_manager
 
 logger = getLogger(__name__)
 

diff --git a/alignak_app/qobjects/systray/tray_icon.py b/alignak_app/qobjects/systray/tray_icon.py
@@ -38,7 +38,7 @@
 from alignak_app.qobjects.common.about import AboutQDialog
 from alignak_app.qobjects.dock.events import send_event
 
-from alignak_app.qthreads.threadmanager import thread_manager
+from alignak_app.qobjects.threads.threadmanager import thread_manager
 
 
 logger = getLogger(__name__)

diff --git a/alignak_app/qthreads/__init__.py → alignak_app/qobjects/threads/__init__.py b/alignak_app/qthreads/__init__.py → alignak_app/qobjects/threads/__init__.py
@@ -20,5 +20,5 @@
 # along with (AlignakApp).  If not, see <http://www.gnu.org/licenses/>.
 
 """
-    The QThreads package contains classes who manage application threads
+    The Threads package contains classes who manage application threads
 """
diff --git a/alignak_app/qthreads/thread.py → alignak_app/qobjects/threads/thread.py b/alignak_app/qthreads/thread.py → alignak_app/qobjects/threads/thread.py
@@ -22,7 +22,7 @@
 """
     Backend Thread
     ++++++++++++++
-    Backend Thread manage creation of QThread for backend requests
+    Backend Thread manage creation of QThreads for backend requests
 """
 
 from logging import getLogger

diff --git a/alignak_app/qthreads/threadmanager.py → ...nak_app/qobjects/threads/threadmanager.py b/alignak_app/qthreads/threadmanager.py → ...nak_app/qobjects/threads/threadmanager.py
@@ -22,14 +22,14 @@
 """
     Thread Manager
     ++++++++++++++
-    Thread Manager manage creation of QObject for launched threads
+    Thread Manager manage BackendQThreads creations and their priority
 """
 
 from logging import getLogger
 
 from PyQt5.Qt import QObject
 
-from alignak_app.qthreads.thread import BackendQThread
+from alignak_app.qobjects.threads.thread import BackendQThread
 
 logger = getLogger(__name__)
 
@@ -128,13 +128,11 @@ def stop_threads(self):
 
         """
 
-        if self.priority_threads or self.current_thread:
-            logger.debug("Finished backend threads have been stopped !")
-        else:
+        if not self.priority_threads and not self.current_thread:
             logger.debug('No thread to stop.')
 
         if self.current_thread:
-            logger.debug('Try to quit current thread: %s', self.current_thread.thread_name)
+            logger.debug('Quit main thread: %s', self.current_thread.thread_name)
             self.current_thread.quit()
             self.current_thread = None
 
@@ -148,7 +146,7 @@ def stop_priority_threads(self):
         """
 
         for thread in self.priority_threads:
-            logger.debug('Try to quit current priority thread: %s', thread.thread_name)
+            logger.debug('Quit priority thread: %s', thread.thread_name)
             thread.quit()
 
             self.priority_threads.remove(thread)

diff --git a/test/test_thread.py b/test/test_thread.py
@@ -24,7 +24,8 @@
 from alignak_app.backend.backend import app_backend
 from alignak_app.utils.config import settings
 from alignak_app.locales.locales import init_localization
-from alignak_app.qthreads.thread import BackendQThread
+
+from alignak_app.qobjects.threads.thread import BackendQThread
 
 settings.init_config()
 init_localization()
@@ -42,3 +43,4 @@ def test_initialize_backend_thread(self):
         under_test = BackendQThread('user')
 
         self.assertEqual('user', under_test.thread_name)
+        self.assertIsNone(under_test.data)
diff --git a/test/test_thread_manager.py b/test/test_thread_manager.py
@@ -24,8 +24,8 @@
 from alignak_app.utils.config import settings
 from alignak_app.locales.locales import init_localization
 
-from alignak_app.qthreads.thread import BackendQThread
-from alignak_app.qthreads.threadmanager import ThreadManager
+from alignak_app.qobjects.threads.thread import BackendQThread
+from alignak_app.qobjects.threads.threadmanager import ThreadManager
 
 settings.init_config()
 init_localization()
@@ -90,7 +90,6 @@ def test_priority_threads(self):
 
         self.assertTrue(len(under_test.priority_threads) == 3)
 
-
     def test_stop_threads(self):
         """Stop All Threads"""