public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-31 22:20:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bad merge

Browse source
This commit is contained in:
Samuel Clay 2021-03-11 10:17:27 -05:00
parent 71eff77f1a
commit c5a9b863b2
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flask_monitor/db_monitor.py
View file

@ -132,25 +132,6 @@ def db_check_redis_story():
else: else:
abort(505) 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") @app.route("/db_check/redis_sessions")
def db_check_redis_sessions(): def db_check_redis_sessions():
try: try:
@ -170,9 +151,8 @@ def db_check_redis_sessions():
@app.route("/db_check/redis_pubsub") @app.route("/db_check/redis_pubsub")
def db_check_redis_pubsub(): def db_check_redis_pubsub():
redis_host = getattr(settings, 'REDIS_PUBSUB', {'host': 'db_redis_pubsub'})
try: try:
r = redis.Redis(redis_host['host'], db=1) r = redis.Redis(LOCAL_HOST, db=1)
except: except:
abort(503) abort(503)
@ -181,7 +161,7 @@ def db_check_redis_pubsub():
except: except:
abort(504) abort(504)
if isinstance(pubsub_numpat, long): if pubsub_numpat or isinstance(pubsub_numpat, long):
return str(pubsub_numpat) return str(pubsub_numpat)
else: else:
abort(505) abort(505)