xtn-tools-pro 1.0.1.1.4__py3-none-any.whl → 1.0.1.1.6__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun_v3.py

@@ -139,7 +139,8 @@ class GoFunTaskV3:
                 go_task_fun_cnt += 1
                 logger.info(f"第{go_task_fun_cnt}次,进程数:{processes_num},线程数:{thread_num},等待{restart_time}秒强制下一次")
 
-            elif self.manager_info["gofun_kill_status"] and go_process_list:
+            elif self.manager_info["gofun_kill_status"] and go_process_list or self.manager_info[
+                "gofun_kill_status_qz"]:
                 # 需kill
                 logger.info("检测到关闭指令，正在关闭gofun进程...")
                 for p in go_process_list:
@@ -147,6 +148,7 @@ class GoFunTaskV3:
                     p.join()
                 go_process_list = []
                 go_task_status_error = 0
+                self.manager_info["gofun_kill_status_qz"] = False
                 logger.info("检测到关闭指令，关闭gofun成功!!!")
 
             elif not self.manager_info["gofun_kill_status"] and go_process_list:
@@ -155,15 +157,6 @@ class GoFunTaskV3:
                     logger.info("检测到已达强制重启间隔，正在重启...")
                     self.manager_info["gofun_kill_status"] = True
 
-            if self.manager_info["gofun_kill_status_qz"]:
-                for p in go_process_list:
-                    # p.terminate()
-                    p.join()
-                go_process_list = []
-                go_task_status_error = 0
-                logger.info("检测到强制关闭指令，关闭gofun成功!!!")
-                self.manager_info["gofun_kill_status_qz"] = False
-
             logger.info(
                 f"主线程正常...进程数:{len(go_process_list)}...gofun(True不存在|False正常):{self.manager_info['gofun_kill_status']}...qz:{self.manager_info['gofun_kill_status_qz']}")
             time.sleep(10)
@@ -209,6 +202,8 @@ class GoFunTaskV3:
                         now_qsize_v_time = get_time_now_timestamp(is_time_10=True)
 
                     if now_qsize_v_time + (60 * 5) < get_time_now_timestamp(is_time_10=True):
+                        now_qsize_v = None
+                        now_qsize_v_time = None
                         manager_info["gofun_kill_status_qz"] = True
 
                     time.sleep(download_not_task_time)

{xtn_tools_pro-1.0.1.1.4.dist-info → xtn_tools_pro-1.0.1.1.6.dist-info}/METADATA

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

{xtn_tools_pro-1.0.1.1.4.dist-info → xtn_tools_pro-1.0.1.1.6.dist-info}/RECORD

@@ -51,7 +51,7 @@ xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDst
 xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 xtn_tools_pro/task_pro/go_fun_air_v1.py,sha256=25gHmW5aAV6nMY9Y6-wD7uQ_wqE39dr-eaegqVbYKM8,11035
 xtn_tools_pro/task_pro/go_fun_v2.py,sha256=SgcXgtEBGSVL1V2LyqO0z8Md2H8JZxucYrLLIwqtiLM,18489
-xtn_tools_pro/task_pro/go_fun_v3.py,sha256=2BiaNmhbYRYy3J53aRsYlaGKnBQ0q4ozC55ckKZVTjg,19794
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=qhsLr9vKDDNp6zqqN2GazCwHQpAhxjlNg7Juj0lyhkA,19616
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=fyqno82Tw8LeF5i8YiEpjPI3oswsqTeWE5Lc9M2ef68,4603
 xtn_tools_pro/utils/file_utils.py,sha256=obaBP7CaBCsXxzqGeWzV2l0yw7vicgKOaXzmpMV8ips,2567
@@ -62,9 +62,9 @@ xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k8
 xtn_tools_pro/utils/shell.py,sha256=2SeC620Fj2Gi4bSWmr6w9-OjOBR1MB_OfTEz5HIwK-k,2940
 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.1.1.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.1.4.dist-info/METADATA,sha256=Foa4TYOyZVH2761eIIvcPE2JgSlzH1MXEVWJQrltIUk,545
-xtn_tools_pro-1.0.1.1.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.1.4.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.1.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.1.4.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.1.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.1.6.dist-info/METADATA,sha256=NDfzDUJnyl9D5QYTi5FR2mY_RGu3Tef8GuWFCFTIjhg,545
+xtn_tools_pro-1.0.1.1.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.1.6.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.1.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.1.6.dist-info/RECORD,,