From 5dba0b201444a65a0cd668bd1c811be09aeaab89 Mon Sep 17 00:00:00 2001 From: Matt Stibbs Date: Sat, 12 Mar 2016 00:22:46 +0000 Subject: [PATCH 1/4] Add support for Heroku Redis --- flask_heroku.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/flask_heroku.py b/flask_heroku.py index f0794f5..cb6495f 100644 --- a/flask_heroku.py +++ b/flask_heroku.py @@ -74,6 +74,14 @@ class Heroku(object): app.config.setdefault('REDIS_HOST', url.hostname) app.config.setdefault('REDIS_PORT', url.port) app.config.setdefault('REDIS_PASSWORD', url.password) + + # Heroku Redis + redis_url = environ.get('REDIS_URL') + if redis_url: + url = urlparse(redis_url) + app.config.setdefault('REDIS_HOST', url.hostname) + app.config.setdefault('REDIS_PORT', url.port) + app.config.setdefault('REDIS_PASSWORD', url.password) # Mongolab mongolab_uri = environ.get('MONGOLAB_URI') From 28ce9657d4eb2c5325b362c7ed6078865319d2ec Mon Sep 17 00:00:00 2001 From: Matt Stibbs Date: Sat, 12 Mar 2016 13:11:53 +0000 Subject: [PATCH 2/4] Swap Heroku Redis and Redis To Go sections --- flask_heroku.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flask_heroku.py b/flask_heroku.py index cb6495f..4a3f2b7 100644 --- a/flask_heroku.py +++ b/flask_heroku.py @@ -66,17 +66,17 @@ class Heroku(object): app.config.setdefault('MAIL_USERNAME', environ.get('POSTMARK_API_KEY')) app.config.setdefault('MAIL_PASSWORD', environ.get('POSTMARK_API_KEY')) app.config.setdefault('MAIL_USE_TLS', True) - - # Redis To Go - redis_url = environ.get('REDISTOGO_URL') + + # Heroku Redis + redis_url = environ.get('REDIS_URL') if redis_url: url = urlparse(redis_url) app.config.setdefault('REDIS_HOST', url.hostname) app.config.setdefault('REDIS_PORT', url.port) app.config.setdefault('REDIS_PASSWORD', url.password) - # Heroku Redis - redis_url = environ.get('REDIS_URL') + # Redis To Go + redis_url = environ.get('REDISTOGO_URL') if redis_url: url = urlparse(redis_url) app.config.setdefault('REDIS_HOST', url.hostname) From e8b5514168389f870ca7d88ab253591ac327e860 Mon Sep 17 00:00:00 2001 From: Matt Stibbs Date: Sun, 13 Mar 2016 11:09:24 +0000 Subject: [PATCH 3/4] Remove trailing whitespace --- flask_heroku.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_heroku.py b/flask_heroku.py index 4a3f2b7..30dcab8 100644 --- a/flask_heroku.py +++ b/flask_heroku.py @@ -66,7 +66,7 @@ class Heroku(object): app.config.setdefault('MAIL_USERNAME', environ.get('POSTMARK_API_KEY')) app.config.setdefault('MAIL_PASSWORD', environ.get('POSTMARK_API_KEY')) app.config.setdefault('MAIL_USE_TLS', True) - + # Heroku Redis redis_url = environ.get('REDIS_URL') if redis_url: From ff31f3cfeaa4bf7391b9eb937bd06f32e32bf5f2 Mon Sep 17 00:00:00 2001 From: Matt Stibbs Date: Sun, 13 Mar 2016 15:33:51 +0000 Subject: [PATCH 4/4] Remove more trailing whitespace --- flask_heroku.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_heroku.py b/flask_heroku.py index 30dcab8..0aceb15 100644 --- a/flask_heroku.py +++ b/flask_heroku.py @@ -74,7 +74,7 @@ class Heroku(object): app.config.setdefault('REDIS_HOST', url.hostname) app.config.setdefault('REDIS_PORT', url.port) app.config.setdefault('REDIS_PASSWORD', url.password) - + # Redis To Go redis_url = environ.get('REDISTOGO_URL') if redis_url: