Update shell_execute.py

appmanage/api/utils/shell_execute.py

@@ -2,51 +2,6 @@
 import os, io, sys, platform, shutil, time, subprocess, json, datetime
 from api.utils.common_log import myLogger
 
-# 执行Shell命令，处理报错和超时，并有返回值
-def execute_Command(cmd_str, timeout=60, timeinner=3, retry=True):
-    print(cmd_str)
-    time_out = 0
-    status = False
-
-    while time_out < timeout:
-        out_str = subprocess.getstatusoutput(cmd_str)
-        print(out_str)
-        if out_str[0] == 0 and out_str[1].find('ERROR') == -1 and out_str[1].find('error') == -1:
-            status = True
-            print('\nExecute successfully')
-            break
-        elif retry:
-            print('\nTry again')
-            time.sleep(timeinner)
-            time_out = time_out + timeinner
-        else:
-            time_out = timeout
-
-    if not status:
-        print('\n此次任务执行有异常，请仔细排查')
-
-# 执行Shell命令，处理报错和超时，并有返回值
-def execute_CommandReturn(cmd_str, timeout=30, timeinner=3):
-    print(cmd_str)
-    time_out = 0
-
-    while time_out < timeout:
-        out_str = subprocess.getstatusoutput(cmd_str)
-        print(out_str)
-        if out_str[0] == 0 and out_str[1].find('ERROR') == -1 and out_str[1].find('error') == -1:
-            # 去掉\n和"
-            # 返回值是元组，不能修改，需要赋值给变量
-            temp_str = out_str[1]
-            temp_str = temp_str.strip('\n')
-            temp_str = temp_str.strip('"')
-            time_out = timeout
-            return temp_str
-        else:
-            time.sleep(timeinner)
-            time_out = time_out + timeinner
-    print('\n此次任务执行失败，请根据下面错误原因排查：')
-    print(out_str)
-
 def execute_command_output(cmd_str):
     print(cmd_str)
     out_str = subprocess.getoutput(cmd_str)