xtn-tools-pro 1.0.0.5.0__py3-none-any.whl → 1.0.0.5.2__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun.py

@@ -16,6 +16,7 @@ import threading
 import multiprocessing
 import concurrent.futures
 from multiprocessing import Process
+from xtn_tools_pro.utils.time_utils import get_time_now_timestamp
 
 
 class GoFun:
@@ -78,39 +79,66 @@ class GoFun:
         upload_queue = multiprocessing.Queue()
         proxies_dict = manager.dict()
 
-        processes_list = []
         processes_item_info = {
             "_download_and_upload_task": {
                 "target": self._download_and_upload_task,
                 "name": "_download_and_upload_task",
                 "args": (download_queue, upload_queue, proxies_dict, self.__ini_info, logger),
+                "start_time": 0,
+                "restart_time": int(restart_time),
             },
             "_go_task_fun_task": {
                 "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),
+                "start_time": 0,
+                "restart_time": int(restart_time),
             },
         }
 
         for p_item in processes_item_info.values():
             task_process = multiprocessing.Process(target=p_item["target"], name=p_item["name"], args=p_item["args"])
-            processes_list.append(task_process)
+            processes_item_info[p_item["name"]]["task_process"] = task_process
+            processes_item_info[p_item["name"]]["start_time"] = get_time_now_timestamp(is_time_10=True)
             task_process.start()
             logger.warning(f"进程已启动,{task_process.is_alive()},{task_process.name},{task_process.pid}")
 
         while True:
             time.sleep(10)
-            for p in processes_list:
+            for p_item_info in processes_item_info.values():
+                task_process = p_item_info["task_process"]
+                task_process_start_time = p_item_info["start_time"]
+                task_process_restart_time = p_item_info.get("restart_time", 0)
                 # 检查子进程是否存活
-                if not p.is_alive():
-                    logger.critical(f"进程不存在,{p.is_alive()},{p.name},{p.pid}")
-                    processes_list.remove(p)
-                    p_item = processes_item_info[p.name]
+                task_process_pid = task_process.pid
+                task_process_name = task_process.name
+                task_process_is_alive = task_process.is_alive()
+                if not task_process_is_alive:
+                    logger.critical(f"进程不存在,{task_process_is_alive},{task_process_name},{task_process_pid}")
+                    p_item = processes_item_info[task_process_name]
                     task_process = multiprocessing.Process(target=p_item["target"], name=p_item["name"],
                                                            args=p_item["args"])
-                    processes_list.append(task_process)
+
+                    processes_item_info[task_process_name]["task_process"] = task_process
+                    processes_item_info[task_process_name]["start_time"] = get_time_now_timestamp(is_time_10=True)
                     task_process.start()
                     logger.warning(f"进程已重启,{task_process.is_alive()},{task_process.name},{task_process.pid}")
+                else:
+                    if not task_process_restart_time:
+                        continue
+                    if task_process_start_time + task_process_restart_time <= get_time_now_timestamp(is_time_10=True):
+                        logger.critical(
+                            f"进程已超过设置时间，正在强制关闭进程,{task_process_restart_time},{task_process_is_alive},{task_process_name},{task_process_pid}")
+                        task_process.terminate()
+                        task_process.join()  # 等待进程确实结束
+                        p_item = processes_item_info[task_process_name]
+                        task_process = multiprocessing.Process(target=p_item["target"], name=p_item["name"],
+                                                               args=p_item["args"])
+
+                        processes_item_info[task_process_name]["task_process"] = task_process
+                        processes_item_info[task_process_name]["start_time"] = get_time_now_timestamp(is_time_10=True)
+                        task_process.start()
+                        logger.warning(f"进程已重启,{task_process.is_alive()},{task_process.name},{task_process.pid}")
 
     def __get_external_ip(self, logger):
         """
@@ -360,3 +388,17 @@ class GoFun:
             "upload_task_tine": "回写间隔",
         }
         return ini_dict
+
+    def get_download_task(self, download_queue, block, timeout):
+        """
+            获取下载任务
+        :param download_queue:下载队列
+        :param block: 是否阻塞等待 True阻塞/False不阻塞
+        :param timeout:
+        :return:
+        """
+        try:
+            task_item = download_queue.get(block=block, timeout=timeout)
+            return task_item
+        except Exception as e:
+            self.logger.critical(f"get_download_task 获取下载任务 报错 {e}")

{xtn_tools_pro-1.0.0.5.0.dist-info → xtn_tools_pro-1.0.0.5.2.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.5.0.dist-info → xtn_tools_pro-1.0.0.5.2.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=AQ8Hc0gifSzjRPZrWqB0x1NVG4t4B-8oexXzDuo-Tf4,15448
+xtn_tools_pro/task_pro/go_fun.py,sha256=bUalIre1D1DZKAz87sYVYD4YY7zKsl_UNcv7Ro5hg9A,18106
 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=m0WtTWkkwtrki1ftP8vCDR8bMfK2gcfUGx5J2x2IlLQ,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.5.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.5.0.dist-info/METADATA,sha256=CakMpRsw3h5eJG3xRck90T3iMKM_BTwmP7wi_VgiVFo,455
-xtn_tools_pro-1.0.0.5.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.5.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.5.0.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.5.2.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.5.2.dist-info/METADATA,sha256=_tqvdchxRkhjxzCQY-kW-yEZMold07wZma49sksTyNY,455
+xtn_tools_pro-1.0.0.5.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.5.2.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.5.2.dist-info/RECORD,,