xtn-tools-pro 1.0.1.1.7__py3-none-any.whl → 1.0.1.1.9__py3-none-any.whl

xtn_tools_pro/utils/shell.py

@@ -36,6 +36,8 @@ class ShellPro:
             self.server_info_list[_]["conn"] = conn
             self.__logger.info(f"{tips} 连接成功!!!")
 
+        self.__retry_cnt = 9999999
+
     def run_shell(self, conn, cmd, warn=False, hide=True, tips="", retry_cnt=5):
         """
             传入conn和命令执行
@@ -46,15 +48,16 @@ class ShellPro:
         :param tips: 备注信息
         :return:
         """
+        retry_cnt = self.__retry_cnt if not retry_cnt else retry_cnt
         for _ in range(retry_cnt):
             try:
                 conn.run(cmd, warn=warn, hide=hide)
                 self.__logger.info(f"{tips} {cmd}")
                 return
             except Exception as e:
-                self.__logger.critical(f"{tips} {cmd} {e} 正在重试")
+                self.__logger.critical(f"失败-正在重试 {tips} {cmd} {e}")
 
-    def update_file(self, local_file, remote_file, mkdir=False):
+    def update_file(self, local_file, remote_file, mkdir=False, retry_cnt=5, chmod=""):
         """
             覆盖远程文件
         :param local_file: 本地文件
@@ -62,6 +65,7 @@ class ShellPro:
         :param mkdir: 是否先在远程创建该路径的文件夹
         :return:
         """
+        retry_cnt = self.__retry_cnt if not retry_cnt else retry_cnt
         for server_item in self.server_info_list:
             ip = server_item["ip"]
             tips = server_item["tips"]
@@ -70,8 +74,17 @@ class ShellPro:
                 remote_dir = os.path.dirname(remote_file)
                 cmd = f"mkdir -p {remote_dir}"
                 self.run_shell(conn, cmd=cmd, warn=True, tips=tips)
-            conn.put(local_file, remote_file)
-            self.__logger.info(f"{tips}-{ip} 覆盖远程文件成功!!!")
+
+            for _ in range(retry_cnt):
+                try:
+                    conn.put(local_file, remote_file)
+                    if chmod:
+                        cmd = f"chmod {chmod} {remote_file}"
+                        self.run_shell(conn, cmd, tips=f"设置文件权限 {chmod}")
+                    self.__logger.info(f"{tips}-{ip} 覆盖远程文件成功!!!")
+                    break
+                except Exception as e:
+                    self.__logger.critical(f"覆盖远程文件-失败-正在重试 {tips} {e}")
 
 
 if __name__ == '__main__':

{xtn_tools_pro-1.0.1.1.7.dist-info → xtn_tools_pro-1.0.1.1.9.dist-info}/METADATA

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

{xtn_tools_pro-1.0.1.1.7.dist-info → xtn_tools_pro-1.0.1.1.9.dist-info}/RECORD

@@ -59,12 +59,12 @@ xtn_tools_pro/utils/helpers.py,sha256=0CTMY7wfSQR_DC9-v1lkKQLpWcB1FL9V_kw_5DOcZ4
 xtn_tools_pro/utils/log.py,sha256=mf5huJDA8xVxxFWPG_tl_vOsAA2_ywGDFycYSGHIDCo,10202
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
-xtn_tools_pro/utils/shell.py,sha256=7wjl1NmKC4GCnUr2vWI_-ljaAUzM50B8FwQySDZGQlg,3157
+xtn_tools_pro/utils/shell.py,sha256=s6sJedxLLQokcI1hF5YSD3qgGUPK0brNcP-D3-yv54I,3790
 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.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.1.7.dist-info/METADATA,sha256=JdNI2SBswrFeiuXXsqFHSSnvQim61Ai-_-rldOuaURE,545
-xtn_tools_pro-1.0.1.1.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.1.7.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.1.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.1.7.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.1.9.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.1.9.dist-info/METADATA,sha256=2j4vwVw6ZR7mAJKz-4XftYVN0qPa6HUd_6qbRq_ZPM4,545
+xtn_tools_pro-1.0.1.1.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.1.9.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.1.9.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.1.9.dist-info/RECORD,,