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

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

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

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

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

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

@@ -88,9 +88,11 @@ class GoFun:
                                                           args=(download_queue, upload_queue, proxies_dict,
                                                                 self.__ini_info, go_task_function, logger))
             go_task_fun_process.start()
+            go_task_fun_process.join()
 
         download_task_process.join()
 
+
     def __get_external_ip(self, logger):
         """
             获取当前网络ip
@@ -103,9 +105,9 @@ class GoFun:
                 logger.warning(f"当前网络ip --> {rp_json}")
                 return rp_json['origin']
             except Exception as e:
-                pass
+                logger.critical(e)
 
-    def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info, logger):
+    def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info,logger):
         """
             使用两个线程 打开 获取任务、回写任务
         :param queue:
@@ -116,11 +118,17 @@ class GoFun:
         caller_class = caller.frame.f_locals.get('self', None)  # 获取调用者的类实例
         if caller_name != "run" or caller_class is None:
             raise Exception("错误调用")
-        thread_download_task = threading.Thread(target=self.__download_task, args=(download_queue, ini_info, logger))
+        # 获取任务
+        thread_download_task = threading.Thread(target=self.__download_task,
+                                                args=(download_queue, ini_info, logger))
         thread_download_task.start()
-        thread_upload_task = threading.Thread(target=self.__upload_task, args=(upload_queue, ini_info, logger))
+        # 回写任务
+        thread_upload_task = threading.Thread(target=self.__upload_task,
+                                              args=(upload_queue, ini_info, logger))
         thread_upload_task.start()
-        thread_update_proxy = threading.Thread(target=self.__update_proxy, args=(proxies_dict, ini_info, logger))
+        # 维护代理
+        thread_update_proxy = threading.Thread(target=self.__update_proxy,
+                                               args=(proxies_dict, ini_info, logger))
         thread_update_proxy.start()
 
     def __download_task(self, download_queue, ini_info, logger):
@@ -196,7 +204,7 @@ class GoFun:
                     }
                     result_list.append(task_item)
             except Exception as e:
-                pass
+                logger.critical(e)
 
             # 回写任务
             data = {"result": result_list, "remoteAddr": external_ip}
@@ -298,7 +306,7 @@ class GoFun:
                 processes_start_list = []
 
             except Exception as e:
-                pass
+                logger.critical(e)
 
     def _run_with_timeout(self, download_queue, upload_queue, proxies_dict, thread_num, logger, go_task_function):
         caller = inspect.stack()[1]  # 获取调用者的调用栈信息

{xtn-tools-pro-1.0.0.4.2 → xtn-tools-pro-1.0.0.4.4}/xtn_tools_pro/utils/log.py

@@ -154,6 +154,7 @@ class Log:
                 color_formatter = ColoredFormatter(
                     # '\033[1m%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s\033[0m',
                     '%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)s] - %(message)s',
+                    # '%(log_color)s[%(now_datestr)s] | %(levelname)-8s | [%(func_name)-20s] | - %(message)s',
                     log_colors=log_colors)  # 加粗对齐
                 # 设置控制台处理器的格式化器为带颜色的格式化器
                 console_handler.setFormatter(color_formatter)

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

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