summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-07-17 13:26:22 +0300
committerLars Wirzenius <liw@liw.fi>2018-07-17 13:26:22 +0300
commite76ba18dc4c2ac7b8528ad88d912460cf39cc978 (patch)
treeee1b0865992424bfe2440f945e9251b4377a34ba
parent4bade9f2258aa8681fc4fd320c7e89425f3755a4 (diff)
downloadqvisqve-e76ba18dc4c2ac7b8528ad88d912460cf39cc978.tar.gz
Add: applications to config
-rw-r--r--qvisqve/app.py3
-rw-r--r--yarns/lib.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/qvisqve/app.py b/qvisqve/app.py
index e608a39..a1f1910 100644
--- a/qvisqve/app.py
+++ b/qvisqve/app.py
@@ -40,7 +40,7 @@ def read_config(filename):
def check_config(cfg):
for key in cfg:
if cfg[key] is None:
- raise Exception('Configration %s should not be None' % key)
+ raise Exception('Configuration %s should not be None' % key)
_counter = slog.Counter()
@@ -58,6 +58,7 @@ default_config = {
'token-private-key': None,
'token-lifetime': None,
'clients': None,
+ 'applications': None,
}
diff --git a/yarns/lib.py b/yarns/lib.py
index 32d6465..9ed7f59 100644
--- a/yarns/lib.py
+++ b/yarns/lib.py
@@ -202,9 +202,11 @@ def start_qvisqve():
'token-issuer': V['iss'],
'token-lifetime': 3600,
'clients': clients,
+ 'applications': V['applications'] or {},
}
env = dict(os.environ)
env['QVISQVE_CONFIG'] = os.path.join(datadir, 'qvisqve.yaml')
+ env['QVISQVE_STARTUP_LOG'] = os.path.join(datadir, 'startup.log')
yaml.safe_dump(config, open(env['QVISQVE_CONFIG'], 'w'))
argv = [
os.path.join(srcdir, 'start_qvisqve'),