X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=3f79a19bfc5d7c467a028d591a0c1a56cca67af1;hb=refs%2Fheads%2Ff4f-review;hp=bd1474bdc84e678f76f37c2fbeda472add2c5e7f;hpb=36a55939d5f370f1ff2b6021796e31edad21d1ff;p=unfold.git diff --git a/myslice/settings.py b/myslice/settings.py index bd1474bd..3f79a19b 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -1,9 +1,26 @@ -# Django settings for unfold project. - import os.path +import logging + +logger = logging.getLogger('myslice') + +# ROOT +try: + ROOT = os.path.realpath(os.path.dirname(__file__) + '/..') +except: + import traceback + traceback.print_exc() + + +from myslice.configengine import ConfigEngine + +config = ConfigEngine() + +import myslice.components as components -import djcelery -djcelery.setup_loader() + + +# import djcelery +# djcelery.setup_loader() ### detect if we're in a build environment try: @@ -12,48 +29,32 @@ try: except: building=True -DEBUG = True -TEMPLATE_DEBUG = DEBUG -# compute ROOT from where this file is installed -# should fit every need including developers -# but you can redefine ROOT if that's not working for you -try: - # get the directory where this file is - ROOT=os.path.dirname(__file__) or '.' - # move one step up - ROOT=os.path.realpath(ROOT+'/..') -except: - # something is badly wrong here - ROOT=None - import traceback - traceback.print_exc() -#### this is where the problem lies I believe -# first try to run manage.py collectstatic without this -# themes -theme=None -try: - from myslice.configengine import ConfigEngine - configEngine = ConfigEngine() - if configEngine.myslice.theme : - theme = configEngine.myslice.theme -except: - pass - -# find out HTTPROOT, which is different from ROOT -# when deployed from a package -# this code is run by collectstatic too, so we cannot -# assume we have ./static present already -HTTPROOT="/var/myslice-f4f" -# the place to store local data, like e.g. the sqlite db -DATAROOT="/var/unfold" -# if not there, then we assume it's from a devel tree -if not os.path.isdir (os.path.join(HTTPROOT,"static")): - HTTPROOT=ROOT - -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 +# DEBUG +if config.myslice.debug : + DEBUG = True +else : + DEBUG = False + +# theme +if config.myslice.theme : + theme = config.myslice.theme +else : + theme = None + +# HTTPROOT +if config.myslice.httproot : + HTTPROOT = config.myslice.httproot +else : + HTTPROOT = ROOT + +# DATAROOT +if config.myslice.httproot : + DATAROOT = config.myslice.dataroot +else : + DATAROOT = ROOT + # dec 2013 - we currently have 2 auxiliary subdirs with various utilities # that we do not wish to package @@ -90,16 +91,32 @@ EMAIL_USE_TLS = False # EMAIL_USE_TLS = False # DEFAULT_FROM_EMAIL = 'testing@example.com' -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': os.path.join(DATAROOT,'unfold.sqlite3'), # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. +if config.database.engine : + DATABASES = { + 'default': { + 'ENGINE' : 'django.db.backends.%s' % config.database.engine, + 'USER' : config.database.user or '', + 'PASSWORD' : config.database.password or '', + 'HOST' : config.database.host or '', + 'PORT' : config.database.port or '', + } + } + if config.database.engine == 'sqlite3' : + DATABASES['default']['NAME'] = os.path.join(DATAROOT,'%s.sqlite3' % config.database.name) + else : + DATABASES['default']['NAME'] = config.database.name +else : + # default database is sqlite + DATABASES = { + 'default': { + 'ENGINE' : 'django.db.backends.sqlite3', + 'NAME' : os.path.join(DATAROOT,'myslice.sqlite3'), + 'USER' : '', + 'PASSWORD' : '', + 'HOST' : '', + 'PORT' : '', + } } -} # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -203,14 +220,14 @@ ROOT_URLCONF = 'myslice.urls' # Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'unfold.wsgi.application' -TEMPLATE_DIRS = [ ] +TEMPLATE_DIRS = [] # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. if theme is not None: - TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"portal/templates", theme)) -TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"portal/templates")) -TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"templates")) + TEMPLATE_DIRS.append( os.path.join(HTTPROOT,"portal/templates", theme) ) +TEMPLATE_DIRS.append( os.path.join(HTTPROOT,"portal/templates") ) +TEMPLATE_DIRS.append( os.path.join(HTTPROOT,"templates") ) INSTALLED_APPS = [ 'django.contrib.auth', @@ -237,22 +254,22 @@ INSTALLED_APPS = [ # Uncomment the next line to enable the admin: 'django.contrib.admin', # FORGE Plugin app - 'djcelery', - 'forge', +# 'djcelery', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'portal', - # SLA - 'sla', ] # this app won't load in a build environment if not building: INSTALLED_APPS.append ('rest') +for component in components.list() : + INSTALLED_APPS.append(component) + 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. @@ -285,6 +302,39 @@ 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', 'django.contrib.auth.backends.ModelBackend')