xtn-tools-pro 1.0.0.5.5__py3-none-any.whl → 1.0.0.5.6__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun.py

@@ -73,6 +73,10 @@ 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()
@@ -83,33 +87,35 @@ class GoFun:
         self.upload_queue = upload_queue
         self.proxies_dict = proxies_dict
 
-        processes_item_info = {
+        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)
@@ -118,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,10 +410,11 @@ class GoFun:
         :return:
         """
         try:
-            task_item = self.download_queue.get(block=block, timeout=timeout)
+            task_item = download_queue.get(block=block, timeout=timeout)
             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,7 +424,11 @@ class GoFun:
         :return:
         """
         try:
-            task_item = self.upload_queue.put(task_item)
+            task_item = upload_queue.put(task_item)
             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.5.dist-info → xtn_tools_pro-1.0.0.5.6.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.5.5.dist-info → xtn_tools_pro-1.0.0.5.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=zqWJxl0ovW1jTEfZOIYJRB3I7HIu1DeDRL1BrBrKW_E,18653
+xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 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.5.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.5.5.dist-info/METADATA,sha256=AAHpgsjjtMBhk4lzHETVXMug5dvCU0MNDflSjvw2EJ0,455
-xtn_tools_pro-1.0.0.5.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.5.5.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.5.5.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.5.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.5.6.dist-info/METADATA,sha256=Iv7HgdNOFDNn9OxtFrruOLvz3NkAoMpJXqSkUKZ5yD0,455
+xtn_tools_pro-1.0.0.5.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.5.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.5.6.dist-info/RECORD,,