xtn-tools-pro 1.0.0.4.4__py3-none-any.whl → 1.0.0.4.6__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun.py

@@ -73,22 +73,40 @@ class GoFun:
             return
 
         # 共享任务队列
+        processes_list = []
         manager = multiprocessing.Manager()
         download_queue = multiprocessing.Queue()
         upload_queue = multiprocessing.Queue()
         proxies_dict = manager.dict()
         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()
-            go_task_fun_process.join()
+
+        while True:
+            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()
 
@@ -105,7 +123,7 @@ class GoFun:
                 logger.warning(f"当前网络ip --> {rp_json}")
                 return rp_json['origin']
             except Exception as e:
-                logger.critical(e)
+                logger.critical(f"获取当前网络ip{e}")
 
     def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info,logger):
         """
@@ -204,7 +222,7 @@ class GoFun:
                     }
                     result_list.append(task_item)
             except Exception as e:
-                logger.critical(e)
+                logger.critical(f"循环全部获取队列的任务{e}")
 
             # 回写任务
             data = {"result": result_list, "remoteAddr": external_ip}
@@ -306,7 +324,7 @@ class GoFun:
                 processes_start_list = []
 
             except Exception as e:
-                logger.critical(e)
+                logger.critical(f"_go_task_fun_task-{e}")
 
     def _run_with_timeout(self, download_queue, upload_queue, proxies_dict, thread_num, logger, go_task_function):
         caller = inspect.stack()[1]  # 获取调用者的调用栈信息

{xtn_tools_pro-1.0.0.4.4.dist-info → xtn_tools_pro-1.0.0.4.6.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.4.4.dist-info → xtn_tools_pro-1.0.0.4.6.dist-info}/RECORD

@@ -10,7 +10,7 @@ xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=45SsMZDc-3Ta4THX38vScjaeRBJSp420AJw
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
 xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
 xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
-xtn_tools_pro/task_pro/go_fun.py,sha256=oUhCTYSwbhHLMSm7u4NJAlX5CygeEnmri0NQgYXHNNM,14440
+xtn_tools_pro/task_pro/go_fun.py,sha256=tGEq3-WFwu2efnc2SbSrMztEqIoAaJyO38WQAV5N-xo,15404
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=RZ5AET4udlraACWMeNF-17JiZ2R6Ahb47_j4tjkV7LE,3190
 xtn_tools_pro/utils/file_utils.py,sha256=VfdIxog4s1UW5NpKkCvQsUs9qHjLoNCnstZbnftkT4w,2046
@@ -19,8 +19,8 @@ xtn_tools_pro/utils/log.py,sha256=3zbKpWNEdU9bOzi7E-CUt4M0cTewCAfxjp8WjxCN9-M,10
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.0.4.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.4.4.dist-info/METADATA,sha256=DqaUxyIfwPXuyCCopcYCLDt5V8qRIVjK8WrFbx6l-IQ,455
-xtn_tools_pro-1.0.0.4.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.4.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.4.4.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.4.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.4.6.dist-info/METADATA,sha256=QJW3IFiyb7n_I2yCq1QDsidxubMRA2tgg34wU4UJnns,455
+xtn_tools_pro-1.0.0.4.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.4.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.4.6.dist-info/RECORD,,