diff options
Diffstat (limited to 'python/Dawn/dawn.py')
| -rw-r--r-- | python/Dawn/dawn.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/python/Dawn/dawn.py b/python/Dawn/dawn.py index 39b05053..c3a88dc8 100644 --- a/python/Dawn/dawn.py +++ b/python/Dawn/dawn.py @@ -6,12 +6,10 @@ import pandas as pd import os import datetime import redis -from utils import load_counterparties, add_triggers, bump_rev, simple_serialize +from utils import load_counterparties, load_trades, add_triggers, bump_rev, simple_serialize app = Flask(__name__) -app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://dawn_user@debian/dawndb' -app.config['SECRET_KEY'] = 'papa' -app.config['UPLOAD_FOLDER'] = 'tickets' +app.config.from_envvar('CONF') def cp_choices(): return Counterparties.query.order_by('name').\ @@ -63,7 +61,7 @@ def trade_manage(tradeid): else: trade.ticket = "{0} {1}.pdf".format(str(trade.trade_date), trade.description) - ticket_file.save(os.path.join(app.config['UPLOAD_FOLDER'], + ticket_file.save(os.path.join(app.config['TICKETS_FOLDER'], trade.ticket)) try: session.commit() @@ -84,7 +82,7 @@ def list_trades(): @app.route('/tickets/<path:filename>') def download_ticket(filename): - return send_from_directory(app.config['UPLOAD_FOLDER'], + return send_from_directory(app.config['TICKETS_FOLDER'], filename, as_attachment=True) @app.route('/counterparties/') @@ -108,7 +106,8 @@ if __name__=="__main__": db.init_app(app) #db.drop_all(app=app) #db.create_all(app=app) - # engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI']) + #engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI']) #add_triggers(engine) #load_counterparties(engine) + #load_trades(engine) app.run(debug=True) |