diff options
| author |   dyh <dengyuanhong@chinamobile.com> | 2020-08-06 09:20:55 +0800 |
|---|---|---|
| committer | dyh <dengyuanhong@chinamobile.com> | 2020-08-07 15:37:08 +0800 |
| commit | 46bd3041d522ddce28ae3450e98c9c49b44b02cc (patch) | |
| tree | 765a04f0a0bc4531d8bb6a0b4aba2304e894a34c /catalog/settings.py | |
| parent | 824413f6f354330f868b38a2ec8cb93b3c8d2808 (diff) | |
1. Remove the mandatory dependency on MSB
2. Refactor config file
Change-Id: I8317ee0e1440e177a54e5510c6393529b6a3a5fe
Issue-ID: MODELING-411
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
Diffstat (limited to 'catalog/settings.py')
| -rw-r--r-- | catalog/settings.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/catalog/settings.py b/catalog/settings.py index cbb90d7..81127b8 100644 --- a/catalog/settings.py +++ b/catalog/settings.py @@ -13,16 +13,14 @@ # limitations under the License. import os -import sys import platform +import sys +from logging import config as log_config -# import catalog.pub.redisco +from onaplogging import monkey -# from catalog.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD -from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT from catalog.pub.config import config as pub_config -from logging import config as log_config -from onaplogging import monkey +from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT monkey.patch_all() @@ -139,7 +137,6 @@ STATICFILES_DIRS = [ pub_config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog") pub_config.CATALOG_URL_PATH = "static/catalog" -pub_config.SDC_BASE_URL = "https://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT) if platform.system() == 'Windows' or 'test' in sys.argv: LOGGING = { |