xtn-tools-pro 1.0.0.5.4__tar.gz → 1.0.0.5.6__tar.gz

{xtn-tools-pro-1.0.0.5.4/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.5.6}/PKG-INFO

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

{xtn-tools-pro-1.0.0.5.4 → xtn-tools-pro-1.0.0.5.6}/setup.py

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

{xtn-tools-pro-1.0.0.5.4 → xtn-tools-pro-1.0.0.5.6}/xtn_tools_pro/task_pro/go_fun.py

@@ -73,39 +73,49 @@ class GoFun:
         if not go_task_function:
             return
 
+        self.__go_task_function = go_task_function
+        self.__create_process()
+
+    def __create_process(self):
         # 共享任务队列
         manager = multiprocessing.Manager()
         download_queue = multiprocessing.Queue()
         upload_queue = multiprocessing.Queue()
         proxies_dict = manager.dict()
 
-        processes_item_info = {
+        self.download_queue = download_queue
+        self.upload_queue = upload_queue
+        self.proxies_dict = proxies_dict
+
+        restart_time = int(self.__ini_info["restart_time"])
+        self.__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),
+                "args": (download_queue, upload_queue, proxies_dict, self.__ini_info, self.logger),
                 "start_time": 0,
-                "restart_time": int(restart_time),
+                "restart_time": 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),
+                "args": (
+                    download_queue, upload_queue, proxies_dict, self.__ini_info, self.__go_task_function, self.logger),
                 "start_time": 0,
                 "restart_time": int(restart_time),
             },
         }
 
-        for p_item in processes_item_info.values():
+        for p_item in self.__processes_item_info.values():
             task_process = multiprocessing.Process(target=p_item["target"], name=p_item["name"], args=p_item["args"])
-            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)
+            self.__processes_item_info[p_item["name"]]["task_process"] = task_process
+            self.__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}")
+            self.logger.warning(f"进程已启动,{task_process.is_alive()},{task_process.name},{task_process.pid}")
 
         while True:
             time.sleep(10)
-            for p_item_info in processes_item_info.values():
+            for p_item_info in self.__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)
@@ -114,31 +124,33 @@ class GoFun:
                 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]
+                    self.logger.critical(f"进程不存在,{task_process_is_alive},{task_process_name},{task_process_pid}")
+                    p_item = self.__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)
+                    self.__processes_item_info[task_process_name]["task_process"] = task_process
+                    self.__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}")
+                    self.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(
+                        self.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]
+                        p_item = self.__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)
+                        self.__processes_item_info[task_process_name]["task_process"] = task_process
+                        self.__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}")
+                        self.logger.warning(f"进程已重启,{task_process.is_alive()},{task_process.name},{task_process.pid}")
 
     def __get_external_ip(self, logger):
         """
@@ -402,6 +414,7 @@ class GoFun:
             return task_item
         except Exception as e:
             self.logger.critical(f"get_download_task 获取下载任务 报错 {e}")
+            return False
 
     def update_upload_task(self, upload_queue, task_item):
         """
@@ -415,3 +428,7 @@ class GoFun:
             return task_item
         except Exception as e:
             self.logger.critical(f"update_upload_task 更新任务 报错 {e}")
+            return False
+
+    def reboot_process(self):
+        print(self.__processes_item_info)

{xtn-tools-pro-1.0.0.5.4 → xtn-tools-pro-1.0.0.5.6/xtn_tools_pro.egg-info}/PKG-INFO

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