xtn-tools-pro 1.0.0.4.7__tar.gz → 1.0.0.4.8__tar.gz

{xtn-tools-pro-1.0.0.4.7/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.4.7
+Version: 1.0.0.4.8
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn-tools-pro-1.0.0.4.7 → xtn-tools-pro-1.0.0.4.8}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.4.7",  # 版本
+    version="1.0.0.4.8",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

{xtn-tools-pro-1.0.0.4.7 → xtn-tools-pro-1.0.0.4.8}/xtn_tools_pro/task_pro/go_fun.py

@@ -101,54 +101,16 @@ class GoFun:
             time.sleep(10)
             for p in processes_list:
                 # 检查子进程是否存活
-                logger.info(f"{p.is_alive()} {p.name} {p.pid} {p}")
                 if not p.is_alive():
-                    print(f"Worker {p.name} is dead. Restarting...")
-
-
-        # 进程死掉，重新启动
-        # processes.remove(p)
-        # new_p = multiprocessing.Process(target=worker, args=(f"Worker-{len(processes) + 1}",))
-        # processes.append(new_p)
-        # new_p.start()
-        #
-        # time.sleep(10)
-
-        # download_task_process.join()
-
-
-        # download_task_process = multiprocessing.Process(target=self._download_and_upload_task,
-        #                                                 name="_download_and_upload_task",
-        #                                                 args=(download_queue, upload_queue, proxies_dict,
-        #                                                       self.__ini_info, logger))
-        # processes_list.append(download_task_process)
-        # download_task_process.start()
-
-        # # 根据配置启动任务
-        # if go_task_function:
-        #     go_task_fun_process = multiprocessing.Process(target=self._go_task_fun_task,
-        #                                                   name="_go_task_fun_task",
-        #                                                   args=(download_queue, upload_queue, proxies_dict,
-        #                                                         self.__ini_info, go_task_function, logger))
-        #     processes_list.append(go_task_fun_process)
-        #     go_task_fun_process.start()
-
-        # while True:
-        #     time.sleep(11)
-        #     for p in processes_list:
-        #         # 检查子进程是否存活
-        #         logger.info(f"{p.is_alive()} {p.name} {p.pid} {p}")
-        #         if not p.is_alive():
-        #             print(f"Worker {p.name} is dead. Restarting...")
-        # 进程死掉，重新启动
-        # processes.remove(p)
-        # new_p = multiprocessing.Process(target=worker, args=(f"Worker-{len(processes) + 1}",))
-        # processes.append(new_p)
-        # new_p.start()
-
-        # time.sleep(10)
-
-        # download_task_process.join()
+                    print(f"{p.is_alive()} {p.name} {p.pid}")
+                    # 进程死掉，重新启动
+                    p.kill()
+                    processes_list.remove(p)
+                    p_item = processes_item_info[p.name]
+                    task_process = multiprocessing.Process(target=p_item["target"], name=p_item["name"],
+                                                           args=p_item["args"])
+                    processes_list.append(task_process)
+                    task_process.start()
 
     def __get_external_ip(self, logger):
         """

{xtn-tools-pro-1.0.0.4.7 → xtn-tools-pro-1.0.0.4.8/xtn_tools_pro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.4.7
+Version: 1.0.0.4.8
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com