Code Review
/
modeling
/
etsicatalog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
1. Remove the mandatory dependency on MSB
[modeling/etsicatalog.git]
/
catalog
/
settings.py
diff --git
a/catalog/settings.py
b/catalog/settings.py
index
cbb90d7
..
81127b8
100644
(file)
--- a/
catalog/settings.py
+++ b/
catalog/settings.py
@@
-13,16
+13,14
@@
# limitations under the License.
import os
# limitations under the License.
import os
-import sys
import platform
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 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()
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.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 = {
if platform.system() == 'Windows' or 'test' in sys.argv:
LOGGING = {