xtn-tools-pro 1.0.0.5.0__tar.gz → 1.0.0.5.2__tar.gz

{xtn-tools-pro-1.0.0.5.0/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.5.2}/PKG-INFO

@@ -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 → xtn-tools-pro-1.0.0.5.2}/setup.py

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

{xtn-tools-pro-1.0.0.5.0 → xtn-tools-pro-1.0.0.5.2}/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 → xtn-tools-pro-1.0.0.5.2/xtn_tools_pro.egg-info}/PKG-INFO

@@ -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