xtn-tools-pro 1.0.0.6.5__py3-none-any.whl → 1.0.0.6.7__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun_v3.py

@@ -101,11 +101,11 @@ class GoFunTaskV3:
         # go_task_fun_cnt = 0
         # go_task_fun_task_process = None
         self.manager_info["gofun_kill_status"] = False  # 进程kill状态，True需要kill/False无需kill
-        self.manager_info["gofun_kill_th_status"] = False  # 线程kill状态，True需要kill/False无需kill
         self.manager_info["gofun_run_status_time"] = get_time_now_timestamp(is_time_10=True)
 
         go_process_list = []
         go_task_fun_cnt = 0
+
         while True:
             if not go_process_list and not self.manager_info["gofun_kill_status"]:
                 # 未启动gofun 且 无需kill 则启动多进程多线程
@@ -135,7 +135,7 @@ class GoFunTaskV3:
                     logger.info("检测到已达强制重启间隔，正在重启...")
                     self.manager_info["gofun_kill_status"] = True
 
-            logger.info("主线程正常...")
+            logger.info(f"主线程正常...{len(go_process_list)}...{self.manager_info['gofun_kill_status']}")
             time.sleep(10)
 
     def __get_external_ip(self):
@@ -170,6 +170,7 @@ class GoFunTaskV3:
                 qsize = download_queue.qsize()
                 logger.info(f"当前队列剩余任务数:{qsize}")
                 if qsize >= 10:
+                    self.manager_info["gofun_kill_status"] = False
                     time.sleep(2)
                     continue
                 resp = requests.get(download_url, headers=headers, params=params, timeout=5)

{xtn_tools_pro-1.0.0.6.5.dist-info → xtn_tools_pro-1.0.0.6.7.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.6.5.dist-info → xtn_tools_pro-1.0.0.6.7.dist-info}/RECORD

@@ -12,7 +12,7 @@ xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,
 xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
 xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 xtn_tools_pro/task_pro/go_fun_v2.py,sha256=SgcXgtEBGSVL1V2LyqO0z8Md2H8JZxucYrLLIwqtiLM,18489
-xtn_tools_pro/task_pro/go_fun_v3.py,sha256=kCntQC-ipYQKWsGL1V8vEf4KVRxoGJ2V3-lHrWPuO0Q,15430
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=r1uuMq4qTxFbsfiRqrwaWDZEC3_MxuiLAOAuGx5Xk3k,15454
 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
@@ -21,8 +21,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.6.5.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.6.5.dist-info/METADATA,sha256=P_L0pMx3KoEObtDmJQYTSWTggfX7LpZKN4GvPusrFUQ,455
-xtn_tools_pro-1.0.0.6.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.6.5.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.6.5.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.6.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.6.7.dist-info/METADATA,sha256=jSppozOgS4z4s7y5McXurIHhRtSV0SG9IW1R5LbOPOA,455
+xtn_tools_pro-1.0.0.6.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.6.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.6.7.dist-info/RECORD,,