update

main.py

@@ -105,6 +105,8 @@ def main():
 
     porter_tasks_file_dir = Path(args.porter_tasks_file_dir)
 
+    # porter manager
+    task_manager = PorterManager()
     for porter_task_file in porter_tasks_file_dir.glob("porter_task_*.json"):
         key = porter_task_file.stem
         value = environment.get(key=key, default=False, dtype=bool)
@@ -112,9 +114,7 @@ def main():
 
         if value is True:
             # porter manager
-            task_manager = PorterManager(
-                tasks_file=porter_task_file.as_posix()
-            )
+            task_manager.add_tasks_by_task_file(tasks_file=porter_task_file.as_posix())
             task_thread = threading.Thread(
                 target=async_thread_wrapper,
                 args=(task_manager.run(),),

toolbox/porter/manager.py

@@ -7,18 +7,16 @@ from toolbox.porter.tasks.base_task import BaseTask
 
 
 class PorterManager(object):
-    def __init__(self,
-                 tasks_file: str,
-                 ):
-        self.tasks_file = tasks_file
-
+    def __init__(self):
         # state
         self.coro_task_set = set()
 
-    def get_init_tasks(self):
-        with open(self.tasks_file, "r", encoding="utf-8") as f:
+    @staticmethod
+    def get_coro_task_set_by_task_file(tasks_file: str):
+        with open(tasks_file, "r", encoding="utf-8") as f:
             tasks = json.load(f)
 
+        coro_task_set = set()
         for task in tasks:
             enable = task.pop("enable")
             task_type = task.pop("type")
@@ -28,14 +26,17 @@ class PorterManager(object):
             task_cls = BaseTask.by_name(task_type)
             task_obj = task_cls(**task)
 
-            self.coro_task_set.add(task_obj.start())
-        return self.coro_task_set
+            coro_task_set.add(task_obj.start())
+        return coro_task_set
 
-    async def run(self):
-        coro_task_set = self.get_init_tasks()
+    async def add_tasks_by_task_file(self, tasks_file: str):
+        coro_task_set = self.get_coro_task_set_by_task_file(tasks_file)
+        self.coro_task_set.update(coro_task_set)
+        return len(coro_task_set)
 
+    async def run(self):
         future_tasks = list()
-        for task in coro_task_set:
+        for task in self.coro_task_set:
             task = asyncio.ensure_future(task)
             # task = asyncio.create_task(task)
             future_tasks.append(task)
@@ -43,10 +44,6 @@ class PorterManager(object):
 
         await asyncio.wait(future_tasks)
 
-    async def run2(self):
-        future_tasks = self.get_init_tasks()
-        await asyncio.wait(future_tasks)
-
 
 async def main():
     import log