diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-05-01 17:35:55 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-05-01 17:35:55 +0200 |
| commit | 9eb0de20f243bb78de0bf9118289f01f1ea1f77c (patch) | |
| tree | 762d3a59d666bf6e1d4d1ea5901c31ab06f7e88e /main.py | |
| parent | 6cffa4af8b5a04b17ffd95738b8e843c4605d4e7 (diff) | |
| parent | 2b1ee8f4d54fa1672510141a71a5817120ac031c (diff) | |
| download | Trader-9eb0de20f243bb78de0bf9118289f01f1ea1f77c.tar.gz Trader-9eb0de20f243bb78de0bf9118289f01f1ea1f77c.tar.zst Trader-9eb0de20f243bb78de0bf9118289f01f1ea1f77c.zip | |
Merge branch 'dev'v1.5
Diffstat (limited to 'main.py')
| -rw-r--r-- | main.py | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -63,7 +63,7 @@ def get_user_market(config_path, user_id, debug=False): | |||
| 63 | if debug: | 63 | if debug: |
| 64 | args.append("--debug") | 64 | args.append("--debug") |
| 65 | args = parse_args(args) | 65 | args = parse_args(args) |
| 66 | pg_config = parse_config(args) | 66 | pg_config, redis_config = parse_config(args) |
| 67 | market_id, market_config, user_id = list(fetch_markets(pg_config, str(user_id)))[0] | 67 | market_id, market_config, user_id = list(fetch_markets(pg_config, str(user_id)))[0] |
| 68 | return market.Market.from_config(market_config, args, | 68 | return market.Market.from_config(market_config, args, |
| 69 | pg_config=pg_config, market_id=market_id, | 69 | pg_config=pg_config, market_id=market_id, |