From c5a9b863b26ddd0a95a3e364918d0bae5dab57ea Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 11 Mar 2021 10:17:27 -0500 Subject: [PATCH] Bad merge --- flask_monitor/db_monitor.py | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/flask_monitor/db_monitor.py b/flask_monitor/db_monitor.py index a3d4cc905..d0044929e 100644 --- a/flask_monitor/db_monitor.py +++ b/flask_monitor/db_monitor.py @@ -132,25 +132,6 @@ def db_check_redis_story(): else: abort(505) -@app.route("/db_check/redis_pubsub") -def db_check_redis_pubsub(): - try: - r = redis.Redis(LOCAL_HOST, db=1) - except: - abort(503) - - try: - pubsub_numpat = r.pubsub_numpat() - except: - abort(504) - - if pubsub_numpat or isinstance(pubsub_numpat, long): - return str(pubsub_numpat) - else: - abort(505) - - - @app.route("/db_check/redis_sessions") def db_check_redis_sessions(): try: @@ -170,9 +151,8 @@ def db_check_redis_sessions(): @app.route("/db_check/redis_pubsub") def db_check_redis_pubsub(): - redis_host = getattr(settings, 'REDIS_PUBSUB', {'host': 'db_redis_pubsub'}) try: - r = redis.Redis(redis_host['host'], db=1) + r = redis.Redis(LOCAL_HOST, db=1) except: abort(503) @@ -181,7 +161,7 @@ def db_check_redis_pubsub(): except: abort(504) - if isinstance(pubsub_numpat, long): + if pubsub_numpat or isinstance(pubsub_numpat, long): return str(pubsub_numpat) else: abort(505)