projects
/
osm
/
LW-UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into v7.0
[osm/LW-UI.git]
/
sf_t3d
/
settings.py
diff --git
a/sf_t3d/settings.py
b/sf_t3d/settings.py
index
644cba9
..
560d05f
100644
(file)
--- a/
sf_t3d/settings.py
+++ b/
sf_t3d/settings.py
@@
-15,6
+15,8
@@
#
import os
#
import os
+import sys
+
from sqlalchemy.engine.url import make_url
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
from sqlalchemy.engine.url import make_url
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@
-62,7
+64,10
@@
INSTALLED_APPS = [
'sdnctrlhandler',
'userhandler',
'rolehandler',
'sdnctrlhandler',
'userhandler',
'rolehandler',
- 'netslicehandler'
+ 'netslicehandler',
+ 'k8sclusterhandler',
+ 'k8srepohandler',
+ 'osmrepohandler'
]
]
@@
-103,6
+108,9
@@
TEMPLATES = [
os.path.join(BASE_DIR, 'sdnctrlhandler', 'template'),
os.path.join(BASE_DIR, 'userhandler', 'templates'),
os.path.join(BASE_DIR, 'netslicehandler', 'template'),
os.path.join(BASE_DIR, 'sdnctrlhandler', 'template'),
os.path.join(BASE_DIR, 'userhandler', 'templates'),
os.path.join(BASE_DIR, 'netslicehandler', 'template'),
+ os.path.join(BASE_DIR, 'k8sclusterhandler', 'template'),
+ os.path.join(BASE_DIR, 'k8srepohandler', 'template'),
+ os.path.join(BASE_DIR, 'osmrepohandler', 'template'),
],
'APP_DIRS': True,
'OPTIONS': {
],
'APP_DIRS': True,
'OPTIONS': {
@@
-206,3
+214,28
@@
else:
LOCALE_PATHS = (
os.path.join(BASE_DIR, 'locale'),
)
LOCALE_PATHS = (
os.path.join(BASE_DIR, 'locale'),
)
+
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'formatters': {
+ 'verbose': {
+ 'format': '[django] %(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+ }
+ },
+ 'handlers': {
+ 'console': {
+ 'level': 'DEBUG',
+ 'class': 'logging.StreamHandler',
+ 'stream': sys.stdout,
+ 'formatter': 'verbose'
+ },
+ },
+ 'loggers': {
+ 'django': {
+ 'handlers': ['console'],
+ 'level': 'DEBUG',
+ 'propagate': True,
+ },
+ },
+}
\ No newline at end of file