Skip to content

Commit

Permalink
Fix debug mode calls get_json twice
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Nov 30, 2015
1 parent 7cd3696 commit 2002f5e
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions panoramix/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,15 +352,16 @@ def datasource(self, datasource_type, datasource_id):
datasource,
form_data=request.args)
if request.args.get("json") == "true":
status = 200
if config.get("DEBUG"):
payload = obj.get_json()
try:
payload = obj.get_json()
status=200
except Exception as e:
logging.exception(e)
payload = str(e)
status=500
else:
try:
payload = obj.get_json()
except Exception as e:
logging.exception(e)
payload = str(e)
status = 500
return Response(
payload,
status=status,
Expand Down

0 comments on commit 2002f5e

Please sign in to comment.