From 7d6f3656b0cc41f3d0b0e747883e7ff156c277f1 Mon Sep 17 00:00:00 2001
From: TooY <330282372@qq.com>
Date: Thu, 16 Mar 2023 10:03:54 +0800
Subject: [PATCH] app manage: update

---
 appmanage/api/service/manage.py      | 4 +++-
 appmanage/api/utils/common_log.py    | 2 +-
 appmanage/api/utils/shell_execute.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/appmanage/api/service/manage.py b/appmanage/api/service/manage.py
index bd442ca5..365c4ff4 100644
--- a/appmanage/api/service/manage.py
+++ b/appmanage/api/service/manage.py
@@ -278,9 +278,11 @@ def uninstall_app(app_id):
     ret = Response(code=const.RETURN_FAIL, message="")
     if_stopped = stop_app(app_id)
     app_name = split_app_id(app_id)
+    real_name = app_id.split("_")[0]
     if if_stopped["code"] == 0:
         cmd = "docker compose -f /data/apps/"+app_name+"/docker-compose.yml down -v"
-        cmd = cmd + " && sudo rm -rf /data/apps/" + app_name
+        if real_name != app_name:
+            cmd = cmd + " && sudo rm -rf /data/apps/" + app_name
         output = shell_execute.execute_command_output_all(cmd)
         if int(output["code"]) == 0:
             ret.code = 0
diff --git a/appmanage/api/utils/common_log.py b/appmanage/api/utils/common_log.py
index cc731163..55f108db 100644
--- a/appmanage/api/utils/common_log.py
+++ b/appmanage/api/utils/common_log.py
@@ -6,7 +6,7 @@ class MyLogging():
     # init logging
     def __init__(self):
         # the file of log
-        logPath = '/data/apps/appmanage/logs/'
+        logPath = 'logs/'
         if not os.path.exists(logPath):
             os.makedirs(logPath)
         logName = 'app_manage_log.log'
diff --git a/appmanage/api/utils/shell_execute.py b/appmanage/api/utils/shell_execute.py
index ce93858e..a97dc4de 100644
--- a/appmanage/api/utils/shell_execute.py
+++ b/appmanage/api/utils/shell_execute.py
@@ -20,7 +20,7 @@ def execute_command_output_all(cmd_str, max_time = 3):
         else:
             execute_time = execute_time + 1
 
-    myLogger.warning_logger("Command execute failed   Commend: " + cmd_str)
+    myLogger.error_logger("Command execute failed   Commend: " + cmd_str)
     return {"code": "-1", "result": "command execute failed, please check your command!"}
 
 def convert_command(cmd_str):