xtn-tools-pro 1.0.0.4.2__py3-none-any.whl → 1.0.0.4.4__py3-none-any.whl

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/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.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/METADATA

@@ -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.dist-info → xtn_tools_pro-1.0.0.4.4.dist-info}/RECORD

@@ -10,17 +10,17 @@ 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=755YOHCo-D6wY4tP7OiB1DPtkd1dR_zqO6kNZ72LtmQ,14141
+xtn_tools_pro/task_pro/go_fun.py,sha256=oUhCTYSwbhHLMSm7u4NJAlX5CygeEnmri0NQgYXHNNM,14440
 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
 xtn_tools_pro/utils/helpers.py,sha256=eHhvhcw_jcUhCA6HwOqpD4XU_V_ZoHDgj3qtLR8yzx8,3812
-xtn_tools_pro/utils/log.py,sha256=XZChGrKWgAz42o_gFi_d7DL28svF1OvAw7NS_xkIgnQ,10056
+xtn_tools_pro/utils/log.py,sha256=3zbKpWNEdU9bOzi7E-CUt4M0cTewCAfxjp8WjxCN9-M,10168
 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.4.2.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.4.2.dist-info/METADATA,sha256=dRKFzOGZju8xXUUclNlxsn3ssPObIC3q3i-gvpV3G5A,455
-xtn_tools_pro-1.0.0.4.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.4.2.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.4.2.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.4.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.4.4.dist-info/METADATA,sha256=DqaUxyIfwPXuyCCopcYCLDt5V8qRIVjK8WrFbx6l-IQ,455
+xtn_tools_pro-1.0.0.4.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.4.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.4.4.dist-info/RECORD,,