Merge pull request #67 from mistercrunch/fix_debug_dup_call

Fix debug mode calls get_json twice
apache · Nov 30, 2015 · 525bd50 · 525bd50
2 parents 852e3c6 + 2002f5e
commit 525bd50
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/panoramix/views.py b/panoramix/views.py
@@ -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,