TooY %!s(int64=2) %!d(string=hai) anos
pai
achega
cef61be09b
Modificáronse 2 ficheiros con 10 adicións e 3 borrados
  1. 2 2
      appmanage/api/service/manage.py
  2. 8 1
      appmanage/api/utils/docker.py

+ 2 - 2
appmanage/api/service/manage.py

@@ -230,7 +230,7 @@ def set_app_info(output_list):
         volume = app_info["ConfigFiles"]  # volume
         volume = app_info["ConfigFiles"]  # volume
         app_name = volume.split('/')[3]
         app_name = volume.split('/')[3]
         app_path = "/data/apps/" + app_name
         app_path = "/data/apps/" + app_name
-        if not os.path.exists(app_path):
+        if not docker.check_directory(app_path):
             continue
             continue
         real_name = docker.read_var(app_name, 'name')
         real_name = docker.read_var(app_name, 'name')
         image_url = get_Image_url(real_name)
         image_url = get_Image_url(real_name)
@@ -288,7 +288,7 @@ def set_app_info(output_list):
         app_list.append(app.dict())
         app_list.append(app.dict())
 
 
     file_path = "/data/apps/running_apps.txt"
     file_path = "/data/apps/running_apps.txt"
-    if os.path.exists(file_path) and os.path.getsize(file_path):
+    if docker.check_directory(file_path):
         with open(file_path, "r", encoding="utf-8") as f:
         with open(file_path, "r", encoding="utf-8") as f:
             for running_app_name in f:
             for running_app_name in f:
                 running_app_name = re.sub("\n", "", running_app_name)
                 running_app_name = re.sub("\n", "", running_app_name)

+ 8 - 1
appmanage/api/utils/docker.py

@@ -65,9 +65,16 @@ def check_app_directory(app_name):
     # websoft9's support applist
     # websoft9's support applist
     myLogger.info_logger("Checking dir...")
     myLogger.info_logger("Checking dir...")
     path = "/data/library/apps/"+app_name
     path = "/data/library/apps/"+app_name
-    is_exists = os.path.exists(path)
+    is_exists = check_directory(path)
     return is_exists
     return is_exists
 
 
+def check_directory(path):
+    output = shell_execute.execute_command_output_all("ls " + path)
+    if int(output["code"]) == 0:
+        return True
+    else:
+        return False
+
 def check_app_compose(app_name):
 def check_app_compose(app_name):
     myLogger.info_logger("Checking port...")
     myLogger.info_logger("Checking port...")
     path = "/data/apps/" + app_name + "/.env"
     path = "/data/apps/" + app_name + "/.env"