pogmommy/rebble-weather
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a few more issues that can cause more 500s than absolutely necessary.

Browse source
This commit is contained in:
Joshua Wise 2020-03-07 23:44:06 -05:00
parent 2a023d51af
commit 0cc1e7581c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
weather/__init__.py
View file

@ -12,8 +12,8 @@ from werkzeug.exceptions import HTTPException
from werkzeug.routing import FloatConverter from werkzeug.routing import FloatConverter
app = Flask(__name__) app = Flask(__name__)
if 'HONEYCOMB_KEY' in os.environ: if os.environ.get('HONEYCOMB_KEY'):
beeline.init(writekey=os.environ['HONEYCOMB_KEY'], dataset='rws', service_name='auth') beeline.init(writekey=os.environ['HONEYCOMB_KEY'], dataset='rws', service_name='weather')
HoneyMiddleware(app, db_events = True) HoneyMiddleware(app, db_events = True)
auth_internal = os.environ['REBBLE_AUTH_URL_INT'] auth_internal = os.environ['REBBLE_AUTH_URL_INT']
@ -49,10 +49,12 @@ def geocode(latitude, longitude):
abort(401) abort(401)
user_req = requests.get(f"{auth_internal}/api/v1/me", user_req = requests.get(f"{auth_internal}/api/v1/me",
headers={'Authorization': f"Bearer {request.args['access_token']}"}) headers={'Authorization': f"Bearer {request.args['access_token']}"})
if user_req.status_code == 401:
abort(401)
user_req.raise_for_status() user_req.raise_for_status()
if not user_req.json()['is_subscribed']: if not user_req.json()['is_subscribed']:
raise HTTPPaymentRequired() raise HTTPPaymentRequired()
beeline.add_context_field("user", user_req.json()['id']) beeline.add_context_field("user", user_req.json()['uid'])
units = request.args.get('units', 'h') units = request.args.get('units', 'h')
language = request.args.get('language', 'en-US') language = request.args.get('language', 'en-US')