From e74e89d1dd9f9d9057064fb87e6e8c01485b09d8 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Thu, 7 Aug 2014 19:15:59 +0200 Subject: [PATCH] Now uses Flasks configuration handler --- tekstmelding.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tekstmelding.py b/tekstmelding.py index 6689d74..c35533b 100644 --- a/tekstmelding.py +++ b/tekstmelding.py @@ -5,25 +5,32 @@ import datetime import config +app = Flask(__name__) +app.config.from_object('config') + db = MySQLdb.connect( - host = config.DATABASE_HOST, - user = config.DATABASE_USER, - passwd = config.DATABASE_PASS, - db = config.DATABASE_NAME, + host = app.config['DATABASE_HOST'], + user = app.config['DATABASE_USER'], + passwd = app.config['DATABASE_PASS'], + db = app.config['DATABASE_NAME'], cursorclass = MySQLdb.cursors.DictCursor) cur = db.cursor() -app = Flask(__name__) - @app.route('/') def main(): return 'Tekstmelding er bezt!' @app.route('/callback') -def callack(): - return 'Callback liksom.' +def callback(): + gsm = request.args.get('gsm', None) + operator = request.args.get('operator', None) + kodeord = request.args.get('kodeord', None) + tekst = request.args.get('tekst', None) + kortnr = request.args.get('kortnr', None) + ip = request.remote_addr + + return 'Got: %s' % (", ".join([('%s="%s"' % (k, v)) for k, v in request.args.items()])) if __name__ == '__main__': - app.debug = config.DEBUG app.run()