get_info ignore if tt=False

alttch · Aug 29, 2019 · babc537 · babc537
1 parent 674297c
commit babc537
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 19 deletions.
diff --git a/atasker/__init__.py b/atasker/__init__.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 from atasker.supervisor import TaskSupervisor
 from atasker.supervisor import TASK_LOW

diff --git a/atasker/co.py b/atasker/co.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 from atasker import task_supervisor
 

diff --git a/atasker/f.py b/atasker/f.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 import traceback
 import threading

diff --git a/atasker/supervisor.py b/atasker/supervisor.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 import threading
 import multiprocessing
@@ -414,21 +414,24 @@ class SupervisorInfo:
                     setattr(result, 'thread_' + p, getattr(self, 'thread_' + p))
                 if self.mp_pool and (tt == TT_MP or tt is None):
                     setattr(result, 'mp_' + p, getattr(self, 'mp_' + p))
-            if tt == TT_THREAD or tt is None:
-                result.thread_tasks = list(self._active_threads)
-                result.threads_active = list(self._active_threads_by_t)
+            if tt == TT_THREAD or tt is None or tt is False:
+                if not tt is False:
+                    result.thread_tasks = list(self._active_threads)
+                    result.threads_active = list(self._active_threads_by_t)
                 result.thread_tasks_count = len(result.thread_tasks)
-            if tt == TT_MP or tt is None:
-                result.mp_tasks = list(self._active_mps)
+            if tt == TT_MP or tt is None or tt is False:
+                if not tt is False:
+                    result.mp_tasks = list(self._active_mps)
                 result.mp_tasks_count = len(result.mp_tasks)
             if aloops:
                 result.aloops = self.aloops.copy()
             if schedulers:
                 result.schedulers = self._schedulers.copy()
-            result.tasks = {}
-            for n, v in self._tasks.items():
-                if tt is None or v.tt == tt:
-                    result.tasks[n] = v
+            if tt != False:
+                result.tasks = {}
+                for n, v in self._tasks.items():
+                    if tt is None or v.tt == tt:
+                        result.tasks[n] = v
         return result
 
     def get_aloops(self):

diff --git a/atasker/threads.py b/atasker/threads.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 import threading
 import time

diff --git a/atasker/workers.py b/atasker/workers.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 import threading
 import logging

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 import setuptools
 

diff --git a/tests/mp.py b/tests/mp.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 def test(*args, **kwargs):
     print('test mp method {} {}'.format(args, kwargs))

diff --git a/tests/mpworker.py b/tests/mpworker.py
@@ -1,7 +1,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 from atasker import BackgroundIntervalWorker
 

diff --git a/tests/test.py b/tests/test.py
@@ -3,7 +3,7 @@
 __author__ = "Altertech Group, https://www.altertech.com/"
 __copyright__ = "Copyright (C) 2018-2019 Altertech Group"
 __license__ = "Apache License 2.0"
-__version__ = "0.3.24"
+__version__ = "0.3.25"
 
 from pathlib import Path