simono41/snappass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24 from voidpirate/master

Browse source 
Catch Connection Error when redis isn't up #22
This commit is contained in:
Nicholas Charriere 2016-08-28 07:27:29 -07:00 committed by GitHub
commit 89eef898e4
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
snappass/main.py
View file

@ -1,7 +1,9 @@
import os import os
import sys
import uuid import uuid
import redis import redis
from redis.exceptions import ConnectionError
from flask import abort, Flask, render_template, request from flask import abort, Flask, render_template, request
@ -22,6 +24,22 @@ time_conversion = {
} }
def check_redis_alive(fn):
def inner(*args, **kwargs):
try:
if fn.__name__ == 'main':
redis_client.ping()
return fn(*args, **kwargs)
except ConnectionError as e:
print('Failed to connect to redis! %s' % e.message)
if fn.__name__ == 'main':
sys.exit(0)
else:
return abort(500)
return inner
@check_redis_alive
def set_password(password, ttl): def set_password(password, ttl):
key = uuid.uuid4().hex key = uuid.uuid4().hex
redis_client.set(key, password) redis_client.set(key, password)
@ -29,6 +47,7 @@ def set_password(password, ttl):
return key return key
@check_redis_alive
def get_password(key): def get_password(key):
password = redis_client.get(key) password = redis_client.get(key)
if password is not None: if password is not None:
@ -82,6 +101,7 @@ def show_password(password_key):
return render_template('password.html', password=password) return render_template('password.html', password=password)
@check_redis_alive
def main(): def main():
app.run(host='0.0.0.0', debug=True) app.run(host='0.0.0.0', debug=True)