From 65dd8fad245a918883fc8423f6996ff9b4d8837a Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 13 May 2016 21:22:05 +0200 Subject: [PATCH] Simpler db connection pattern --- backend.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/backend.py b/backend.py index f3077a8..94f28e8 100644 --- a/backend.py +++ b/backend.py @@ -10,16 +10,11 @@ import psycopg2.extras def db_connect(): - try: - db = psycopg2.connect(dbname="oedb") - except: - db_host = os.getenv("DB_HOST", "localhost") - db_user = os.getenv("DB_USER", "oedb") - db_password = os.getenv("POSTGRES_PASSWORD", "") - db = psycopg2.connect(dbname="oedb", host=db_host, - password=db_password, user=db_user) - - return db + return psycopg2.connect( + dbname=os.getenv("DB_NAME", "oedb"), + host=os.getenv("DB_HOST", None), + password=os.getenv("POSTGRES_PASSWORD", None), + user=os.getenv("DB_USER", None)) def standard_headers(resp):