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
Settings: removed print version
[unfold.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
9cea436
..
f5d11d2
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-1,5
+1,6
@@
import os.path
import logging
import os.path
import logging
+import subprocess
logger = logging.getLogger('myslice')
logger = logging.getLogger('myslice')
@@
-8,7
+9,7
@@
try:
ROOT = os.path.realpath(os.path.dirname(__file__) + '/..')
except:
import traceback
ROOT = os.path.realpath(os.path.dirname(__file__) + '/..')
except:
import traceback
-
traceback.print_exc(
)
+
logger.error(traceback.format_exc()
)
from myslice.configengine import ConfigEngine
from myslice.configengine import ConfigEngine
@@
-17,8
+18,6
@@
config = ConfigEngine()
import myslice.components as components
import myslice.components as components
-
-
# import djcelery
# djcelery.setup_loader()
# import djcelery
# djcelery.setup_loader()
@@
-29,11
+28,16
@@
try:
except:
building=True
except:
building=True
-
+if not config.myslice.portal_version:
+ try:
+ PORTAL_VERSION = subprocess.check_output(["git", "describe"])
+ except:
+ PORTAL_VERSION = 'not using git'
# DEBUG
if config.myslice.debug :
DEBUG = True
# DEBUG
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
@@
-249,8
+253,6
@@
INSTALLED_APPS = [
'plugins',
# views - more or less stable
'ui',
'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
@@
-258,9
+260,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)
@@
-269,7
+280,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.
@@
-351,7
+362,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"