From f296dce935b598488ef59991c1eca3d54ee448eb Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Wed, 11 Dec 2019 11:53:46 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9config=20=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=80=BB=E8=BE=91=20(#3528)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/conf.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 094f8b9c1..9496de6a3 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -442,10 +442,10 @@ class ConfigManager:
         try:
             from config import config as c
             self.from_object(c)
-            return self.config
+            return True
         except ImportError:
             pass
-        return None
+        return False
 
     def load_from_yml(self):
         for i in ['config.yml', 'config.yaml']:
@@ -453,7 +453,7 @@ class ConfigManager:
                 continue
             loaded = self.from_yaml(i)
             if loaded:
-                return self.config
+                return True
         return False
 
     @classmethod
@@ -462,20 +462,20 @@ class ConfigManager:
         cls.config_class = config_class
         if not root_path:
             root_path = PROJECT_DIR
+
         manager = cls(root_path=root_path)
-        config = manager.load_from_object()
-        if config:
-            return config
-        config = manager.load_from_yml()
-        if config:
-            return config
-        msg = """
+        if manager.load_from_object():
+            return manager.config
+        elif manager.load_from_yml():
+            return manager.config
+        else:
+            msg = """
 
-        Error: No config file found.
+            Error: No config file found.
 
-        You can run `cp config_example.yml config.yml`, and edit it.
-        """
-        raise ImportError(msg)
+            You can run `cp config_example.yml config.yml`, and edit it.
+            """
+            raise ImportError(msg)
 
     @classmethod
     def get_dynamic_config(cls, config):