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
d322848
..
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')
@@
-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,7
+28,11
@@
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
if config.myslice.debug :
@@
-360,6
+363,5
@@
CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
####SLA#####
SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
####SLA#####
SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
-#SLA_COLLECTOR_URL = "http://172.24.76.19:8000/sla" // TODO: Remove line
SLA_COLLECTOR_USER = "portal"
SLA_COLLECTOR_PASSWORD = "password"
SLA_COLLECTOR_USER = "portal"
SLA_COLLECTOR_PASSWORD = "password"