git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Footer with version number
[unfold.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
6a4518c
..
371296b
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-1,15
+1,23
@@
-#from __future__ import print_function
import os.path
import os.path
+import logging
+import subprocess
+logger = logging.getLogger('myslice')
+
+# ROOT
try:
ROOT = os.path.realpath(os.path.dirname(__file__) + '/..')
except:
import traceback
try:
ROOT = os.path.realpath(os.path.dirname(__file__) + '/..')
except:
import traceback
- traceback.print_exc()
+ logger.error(traceback.format_exc())
+
-import myslice.components as components
from myslice.configengine import ConfigEngine
from myslice.configengine import ConfigEngine
+config = ConfigEngine()
+
+import myslice.components as components
+
# import djcelery
# djcelery.setup_loader()
# import djcelery
# djcelery.setup_loader()
@@
-20,14
+28,25
@@
try:
except:
building=True
except:
building=True
-config = ConfigEngine()
+if not config.myslice.portal_version:
+ try:
+ PORTAL_VERSION = subprocess.check_output(["git", "describe"])
+ except:
+ PORTAL_VERSION = 'not using git'
+
+print 'x'*100
+print PORTAL_VERSION
+print 'x'*100
+logger.debug('PORTAL_VERSION = ',PORTAL_VERSION)
+# DEBUG
if config.myslice.debug :
DEBUG = True
if config.myslice.debug :
DEBUG = True
+ INTERNAL_IPS = ("127.0.0.1","132.227.84.195","132.227.78.191","132.227.84.191")
else :
DEBUG = False
else :
DEBUG = False
-# theme
s
+# theme
if config.myslice.theme :
theme = config.myslice.theme
else :
if config.myslice.theme :
theme = config.myslice.theme
else :
@@
-81,7
+100,7
@@
EMAIL_USE_TLS = False
# EMAIL_USE_TLS = False
# DEFAULT_FROM_EMAIL = 'testing@example.com'
# EMAIL_USE_TLS = False
# DEFAULT_FROM_EMAIL = 'testing@example.com'
-if config.database :
+if config.database
.engine
:
DATABASES = {
'default': {
'ENGINE' : 'django.db.backends.%s' % config.database.engine,
DATABASES = {
'default': {
'ENGINE' : 'django.db.backends.%s' % config.database.engine,
@@
-107,7
+126,7
@@
else :
'PORT' : '',
}
}
'PORT' : '',
}
}
-print DATABASES
+
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
@@
-232,15
+251,13
@@
INSTALLED_APPS = [
# our django project
'myslice',
# the core of the UI
# our django project
'myslice',
# the core of the UI
- 'auth',
+ '
local
auth',
'manifoldapi',
'unfold',
# plugins
'plugins',
# views - more or less stable
'ui',
'manifoldapi',
'unfold',
# plugins
'plugins',
# views - more or less stable
'ui',
- # managing database migrations
- 'south',
# Uncomment the next line to enable the admin:
'django.contrib.admin',
# FORGE Plugin app
# Uncomment the next line to enable the admin:
'django.contrib.admin',
# FORGE Plugin app
@@
-248,9
+265,18
@@
INSTALLED_APPS = [
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'portal',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'portal',
+ #'debug_toolbar',
]
]
+# with django-1.7 we leave south and use native migrations
+# managing database migrations
+import django
+major, minor, _, _, _ = django.VERSION
+if major == 1 and minor <= 6:
+ INSTALLED_APPS.append('south')
+
# this app won't load in a build environment
# this app won't load in a build environment
-if not building: INSTALLED_APPS.append ('rest')
+if not building:
+ INSTALLED_APPS.append ('rest')
for component in components.list() :
INSTALLED_APPS.append(component)
for component in components.list() :
INSTALLED_APPS.append(component)
@@
-259,7
+285,7
@@
BROKER_URL = "amqp://myslice:myslice@localhost:5672/myslice"
for aux in auxiliaries:
if os.path.isdir(os.path.join(ROOT,aux)):
for aux in auxiliaries:
if os.path.isdir(os.path.join(ROOT,aux)):
-
print("Using devel auxiliary",aux
)
+
logger.info("Using devel auxiliary {}".format(aux)
)
INSTALLED_APPS.append(aux)
ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.
INSTALLED_APPS.append(aux)
ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.
@@
-292,8
+318,41
@@
LOGGING = {
},
}
}
},
}
}
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': True,
+ 'formatters': {
+ 'verbose': {
+ 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+ },
+ 'simple': {
+ 'format': '%(levelname)s %(message)s'
+ },
+ },
+ 'filters': {
+
+ },
+ 'handlers': {
+ 'null': {
+ 'level': 'DEBUG',
+ 'class': 'django.utils.log.NullHandler',
+ },
+ 'debug':{
+ 'level': 'DEBUG',
+ 'class': 'logging.StreamHandler',
+ 'formatter': 'simple'
+ }
+ },
+ 'loggers': {
+ 'myslice': {
+ 'handlers': ['debug'],
+ 'propagate': True,
+ 'level': 'DEBUG',
+ }
+ }
+}
-AUTHENTICATION_BACKENDS = ('auth.manifoldbackend.ManifoldBackend',
+AUTHENTICATION_BACKENDS = ('
local
auth.manifoldbackend.ManifoldBackend',
'django.contrib.auth.backends.ModelBackend')
### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
'django.contrib.auth.backends.ModelBackend')
### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
@@
-308,7
+367,6
@@
CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
####SLA#####
####SLA#####
-SLA_MANAGER_URL = "http://157.193.215.125:4001/sla-collector/sla"
-#SLA_MANAGER_URL = "http://172.24.76.28:8000/sla"
-SLA_MANAGER_USER = "portal"
-SLA_MANAGER_PASSWORD = "password"
+SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+SLA_COLLECTOR_USER = "portal"
+SLA_COLLECTOR_PASSWORD = "password"