diff options
| author | Lars Wirzenius <liw@liw.fi> | 2018-02-02 18:10:47 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2018-02-02 18:16:02 +0200 |
| commit | fe96bbae153c8157fee9e7904cbbe4e0b8fd2057 (patch) | |
| tree | 782c7f9cb8674c3a90f65ba82e8600b1dcf06711 /yarns | |
| parent | 481aebba3bc400ddb61dd5e952fb0ebc4e600290 (diff) | |
| download | qvisqve-fe96bbae153c8157fee9e7904cbbe4e0b8fd2057.tar.gz | |
Fix: adapt yarns for start_salami changes
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/900-local.yarn | 1 | ||||
| -rw-r--r-- | yarns/lib.py | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/yarns/900-local.yarn b/yarns/900-local.yarn index 64ed4c0..09add3c 100644 --- a/yarns/900-local.yarn +++ b/yarns/900-local.yarn @@ -62,7 +62,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. IMPLEMENTS GIVEN a running salami instance start_salami() - print(repr(start_salami)) assert V['API_URL'] is not None ## Stop a Salami we started diff --git a/yarns/lib.py b/yarns/lib.py index cabd943..b36869d 100644 --- a/yarns/lib.py +++ b/yarns/lib.py @@ -185,6 +185,10 @@ def start_salami(): } config = { + 'gunicorn': True, + 'gunicorn-log': 'gunicorn.log', + 'gunicorn-pid-file': V['pid-file'], + 'gunicorn-port': V['port'], 'log': [ { 'filename': V['api.log'], @@ -193,7 +197,6 @@ def start_salami(): 'token-private-key': V['privkey'], 'token-public-key': V['pubkey'], 'token-issuer': V['iss'], - 'token-audience': V['aud'], 'token-lifetime': 3600, 'clients': clients, } @@ -202,11 +205,7 @@ def start_salami(): yaml.safe_dump(config, open(env['SALAMI_CONFIG'], 'w')) argv = [ os.path.join(srcdir, 'start_salami'), - 'debug', - 'token.jwt', - V['pid-file'], - str(V['port']), - '--daemon', + env['SALAMI_CONFIG'], ] cliapp.runcmd(argv, env=env, stdout=None, stderr=None) until = time.time() + 2.0 |