add inner_config_dev_path & obdiag list command fix (oceanbase#622)

* move code * move code * move code * add inner_config_dev_path
jingyd66 · Dec 12, 2024 · 7699585 · 7699585
1 parent e7020f7
commit 7699585
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/common/config.py b/src/common/config.py
@@ -29,7 +29,12 @@
     absPath = os.path.dirname(os.path.abspath(sys.executable))
 else:
     absPath = os.path.dirname(os.path.abspath(__file__))
-INNER_CONFIG_FILE = os.path.join(absPath, "../../conf/inner_config.yml")
+inner_config_release_path = os.path.join(absPath, "conf/inner_config.yml")
+inner_config_dev_path = os.path.join(absPath, "../../conf/inner_config.yml")
+if os.path.exists(inner_config_release_path):
+    INNER_CONFIG_FILE = inner_config_release_path
+else:
+    INNER_CONFIG_FILE = inner_config_dev_path
 
 DEFAULT_CONFIG_DATA = '''
 obcluster:

diff --git a/src/handler/checker/check_list.py b/src/handler/checker/check_list.py
@@ -37,7 +37,7 @@ def handle(self):
             result_map = {}
             for file in files:
                 if "check_package" in file:
-                    cases_map = {"all": {"name": "all", "command": "obdiag check", "info_en": "default check all task without filter", "info_cn": "默认执行除filter组里的所有巡检项"}}
+                    cases_map = {"all": {"name": "all", "command": "obdiag check run", "info_en": "default check all task without filter", "info_cn": "默认执行除filter组里的所有巡检项"}}
                     # Obtain which files match and corresponding header files
                     # Using string segmentation methods
                     parts = file.split('_')