X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fsettings.py;h=3e5b919d0f1b60280cff314598484193ce022945;hb=75d2b393a082da6b13dad01e24ee97eccf63d1ee;hp=cbb90d7fa5496255a07598137d60ab844d848334;hpb=9d63f079341419d875ac5e697cefde920d26c802;p=modeling%2Fetsicatalog.git diff --git a/catalog/settings.py b/catalog/settings.py index cbb90d7..3e5b919 100644 --- a/catalog/settings.py +++ b/catalog/settings.py @@ -13,18 +13,12 @@ # limitations under the License. import os -import sys import platform - -# import catalog.pub.redisco - -# 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 +import sys from logging import config as log_config -from onaplogging import monkey -monkey.patch_all() +from catalog.pub.config import config as pub_config +from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -88,7 +82,6 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'catalog.middleware.LogContextMiddleware', ] ROOT_URLCONF = 'catalog.urls' @@ -139,7 +132,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 = {