From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 19 Feb 2015 15:32:13 +0000 (+0100)
Subject: set DATAROOT to ROOT when this directory does not exist
X-Git-Tag: myslice-1.3~88^2~1
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=45ea7c4ae1398b959f23b4a47d584aa1986604bc

set DATAROOT to ROOT when this directory does not exist
this is for a development environment
without this change the DB is unconditionnally located under /var/unfold which is not supposed to exist on a devel box
--
from __future__ import print_function
--
new flag DEBUG_SETTINGS
removed TEMPLATE_DEBUG which is not used anymore
---

diff --git a/myslice/settings.py b/myslice/settings.py
index bd1474bd..10b39533 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -1,5 +1,7 @@
 # Django settings for unfold project.
 
+from __future__ import print_function
+
 import os.path
 
 import djcelery
@@ -13,7 +15,9 @@ except:
     building=True
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+
+# show the various settings as we go
+DEBUG_SETTINGS = False
 
 # compute ROOT from where this file is installed
 # should fit every need including developers
@@ -48,6 +52,10 @@ except:
 HTTPROOT="/var/myslice-f4f"
 # the place to store local data, like e.g. the sqlite db
 DATAROOT="/var/unfold"
+if not os.path.isdir(DATAROOT):
+    print("WARNING: {} is a non-existing directory".format(DATAROOT))
+    print("consequently we assume development mode and re-route DATAROOT to {}".format(ROOT))
+    DATAROOT=ROOT
 # if not there, then we assume it's from a devel tree
 if not os.path.isdir (os.path.join(HTTPROOT,"static")):
     HTTPROOT=ROOT
@@ -55,6 +63,11 @@ if not os.path.isdir (os.path.join(HTTPROOT,"static")):
 if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
 if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
 
+if DEBUG_SETTINGS:
+    print('ROOT', ROOT)
+    print('DATAROOT', DATAROOT)
+    print('HTTPROOT', HTTPROOT)
+
 # dec 2013 - we currently have 2 auxiliary subdirs with various utilities
 # that we do not wish to package 
 # * sandbox is for plugin developers
@@ -101,6 +114,9 @@ DATABASES = {
     }
 }
 
+if DEBUG_SETTINGS:
+    print('DATABASE NAME',DATABASES['default']['NAME'])
+
 # 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.
@@ -252,7 +268,7 @@ BROKER_URL = "amqp://myslice:myslice@localhost:5672/myslice"
 
 for aux in auxiliaries:
     if os.path.isdir(os.path.join(ROOT,aux)): 
-        print "Using devel auxiliary",aux
+        print("Using devel auxiliary",aux)
         INSTALLED_APPS.append(aux)
 
 ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.