diff --git a/requirements.txt b/requirements.txt index eea965a..a60b84d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,6 @@ ordereddict jinja2==2.7.3 argparse -eveapi>=1.2.6 \ No newline at end of file +eveapi>=1.2.6 +Flask==0.10.1 +Flask-Redis==0.0.6 \ No newline at end of file diff --git a/standings/app.py b/standings/app.py index dbb4f5a..e5e64ec 100644 --- a/standings/app.py +++ b/standings/app.py @@ -1,11 +1,12 @@ -from flask import Flask, jsonify +import os +from flask import Flask, jsonify, current_app from flask.ext.redis import Redis from standings import Standings from standings.cache import EVEAPIRedisCache app = Flask(__name__) -app.config['REDIS_URL'] = os.environ.get('REDIS_URL') +app.config['REDIS_URL'] = os.environ.get('REDIS_URL', 'redis://localhost:6379/0') app.config['API_KEY_ID'] = os.environ.get('STANDINGS_API_KEY_ID') app.config['API_KEY_VCODE'] = os.environ.get('STANDINGS_API_KEY_VCODE') redis = Redis(app) @@ -13,21 +14,29 @@ cache = EVEAPIRedisCache(redis) standings = Standings(app.config['API_KEY_ID'], app.config['API_KEY_VCODE'], cache_handler=cache) +def check_config(): + if not current_app.config['API_KEY_ID'] or current_app.config['API_KEY_VCODE']: + return 'Invalid API details specified, please check your configuration.' + @app.route('/') @app.route('/standings.html') def index_html(): - return standings.html() + check_config() + return standings.html() @app.route('/standings.txt') def index_txt(): - return standings.text() + check_config() + return standings.text() @app.route('/standings.json') def index_json(): + check_config() return jsonify(standings._get_standings()) -@app.route('/') +@app.route('/