arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable isso settings directory

Browse Source 
Useful to start multiple sites in a simpler way e.g. export ISSO_SETTINGS_DIR=/etc/isso.d/enabled
This commit is contained in:
Federico Ceratto 2014-06-15 13:54:42 +00:00
parent 9260e143f1
commit fb28eb85c5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
isso/dispatch.py
View File

@ -1,5 +1,6 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
from glob import glob
import os import os
import logging import logging
@ -44,9 +45,7 @@ class Dispatcher(DispatcherMiddleware):
return resp(environ, start_response) return resp(environ, start_response)
if "ISSO_SETTINGS" not in os.environ: if "ISSO_SETTINGS" in os.environ:
logger.fatal('no such environment variable: ISSO_SETTINGS')
else:
confs = os.environ["ISSO_SETTINGS"].split(";") confs = os.environ["ISSO_SETTINGS"].split(";")
for path in confs: for path in confs:
if not os.path.isfile(path): if not os.path.isfile(path):
@ -54,3 +53,11 @@ else:
break break
else: else:
application = wsgi.SubURI(Dispatcher(*confs)) application = wsgi.SubURI(Dispatcher(*confs))
elif "ISSO_SETTINGS_DIR" in os.environ:
conf_glob = os.path.join(os.environ["ISSO_SETTINGS_DIR"], '*.cfg')
confs = glob(conf_glob)
application = wsgi.SubURI(Dispatcher(*confs))
else:
logger.fatal('environment variable ISSO_SETTINGS or ISSO_SETTINGS_DIR must be set')