xtn-tools-pro 1.0.0.4.0__tar.gz → 1.0.0.4.2__tar.gz

{xtn-tools-pro-1.0.0.4.0/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.4.2}/PKG-INFO

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

{xtn-tools-pro-1.0.0.4.0 → xtn-tools-pro-1.0.0.4.2}/setup.py

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

{xtn-tools-pro-1.0.0.4.0 → xtn-tools-pro-1.0.0.4.2}/xtn_tools_pro/task_pro/go_fun.py

@@ -51,7 +51,7 @@ class GoFun:
                 raise Exception(f"ini_dict 配置 {server_k} 不存在")
 
         logger.debug(
-            f"\n当前设置配置如下:\n\t功能函数重启间隔:{restart_time};进程数:{processes_num};线程数:{thread_num}\n\t代理更新间隔:{update_proxies_time};回写间隔{upload_task_tine}\n")
+            f"\n无敌框架来咯~~~当前设置配置如下:\n\t功能函数重启间隔:{restart_time};进程数:{processes_num};线程数:{thread_num}\n\t代理更新间隔:{update_proxies_time};回写间隔{upload_task_tine}\n")
 
         if port:
             task_host = f"http://{host}:{port}"
@@ -61,7 +61,6 @@ class GoFun:
         download_url = task_host + "/filter_server/phone/get"
         upload_url = task_host + "/filter_server/phone/update"
         update_proxy_url = task_host + f"/filter_server/proxy/random/get?taskType={task}&limit=1"
-        logger.debug("无敌框架来咯~")
 
         external_ip = self.__get_external_ip(self.logger)
 
@@ -139,7 +138,7 @@ class GoFun:
         while True:
             try:
                 qsize = download_queue.qsize()
-                logger.info(f"当前队列剩余任务数：{qsize}")
+                logger.info(f"当前队列剩余任务数:{qsize}")
                 if qsize >= 10:
                     time.sleep(2)
                     continue
@@ -156,9 +155,9 @@ class GoFun:
                     if not phone_item.isdigit():  # 判断是否全是整数(不包括小数点或负号)
                         continue
                     download_queue.put(task_item)
-                logger.warning(f"成功获取任务个数：{len(result_list)}")
+                logger.warning(f"成功获取任务个数:{len(result_list)}")
             except Exception as e:
-                logger.critical(f"获取任务请求异常：{e}")
+                logger.critical(f"获取任务请求异常:{e}")
                 time.sleep(2)
 
     def __upload_task(self, upload_queue, ini_info, logger):
@@ -234,13 +233,13 @@ class GoFun:
                     status_code = resp.status_code
                     result_list = json_data.get("result", [])
                     if not result_list or status_code != 200:
-                        logger.critical(f"获取代理响应异常：{status_code} {len(result_list)} {json_data}")
+                        logger.critical(f"获取代理响应异常:{status_code} {len(result_list)} {json_data}")
                         time.sleep(2)
 
                     proxies_dict['http'] = 'http://' + random.choice(result_list)
                     proxies_dict['https'] = 'http://' + random.choice(result_list)
                     proxies_dict['status'] = True
-                    logger.warning(f"成功获取代理：{proxies_dict}")
+                    logger.warning(f"成功获取代理:{proxies_dict}")
 
                 if not update_proxies_time:
                     # 一直执行 不退出
@@ -249,7 +248,7 @@ class GoFun:
                 time.sleep(update_proxies_time)
                 proxies_dict['status'] = False
             except Exception as e:
-                logger.critical(f"获取代理请求异常：{e}")
+                logger.critical(f"获取代理请求异常:{e}")
                 time.sleep(2)
 
     def _go_task_fun_task(self, download_queue, upload_queue, proxies_dict, ini_info, go_task_function, logger):
@@ -277,11 +276,13 @@ class GoFun:
             try:
                 if not processes_start_list:
                     go_task_fun_cnt += 1
-                    logger.debug(
+                    logger.info(
                         f"第{go_task_fun_cnt}次,进程数:{processes_num},线程数:{thread_num},等待{restart_time}秒强制下一次")
                     for i in range(processes_num):
                         p = Process(target=self._run_with_timeout,
-                                    args=(download_queue, upload_queue, proxies_dict, thread_num, go_task_function))
+                                    args=(
+                                        download_queue, upload_queue, proxies_dict, thread_num, logger,
+                                        go_task_function))
                         processes_start_list.append(p)
                         p.start()
 
@@ -299,7 +300,7 @@ class GoFun:
             except Exception as e:
                 pass
 
-    def _run_with_timeout(self, download_queue, upload_queue, proxies_dict, thread_num, go_task_function):
+    def _run_with_timeout(self, download_queue, upload_queue, proxies_dict, thread_num, logger, go_task_function):
         caller = inspect.stack()[1]  # 获取调用者的调用栈信息
         caller_name = caller.function  # 获取调用者的函数名
         caller_class = caller.frame.f_locals.get('self', None)  # 获取调用者的类实例
@@ -308,7 +309,7 @@ class GoFun:
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=thread_num) as executor:
             # 提交10个函数到线程池中执行
-            futures = [executor.submit(go_task_function, download_queue, upload_queue, proxies_dict) for _ in
+            futures = [executor.submit(go_task_function, download_queue, upload_queue, proxies_dict, logger) for _ in
                        range(thread_num)]
 
             # 等待所有线程完成

{xtn-tools-pro-1.0.0.4.0 → xtn-tools-pro-1.0.0.4.2/xtn_tools_pro.egg-info}/PKG-INFO

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