[GNUnet-SVN] [taler-merchant-frontends] branch master updated: #5090

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new e0ef4c1   #5090
e0ef4c1 is described below

commit e0ef4c1ed3acd91591c76001e003667cb2bf672d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jun 22 11:13:39 2017 +0200

     #5090
---
 talerfrontends/blog/blog.py | 24 +++++++++---------------
 talerfrontends/helpers.py   |  9 +++++++++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/talerfrontends/blog/blog.py b/talerfrontends/blog/blog.py
index dfc2e1a..ae16bb7 100644
--- a/talerfrontends/blog/blog.py
+++ b/talerfrontends/blog/blog.py
@@ -33,7 +33,8 @@ import datetime
 from pprint import pprint
 from talerfrontends.talerconfig import TalerConfig
 from talerfrontends.helpers import (make_url,
-expect_parameter, join_urlparts, get_query_string)
+expect_parameter, join_urlparts, get_query_string,
+backend_error)
 from talerfrontends.blog.content import (articles,
 get_article_file, get_image_file)
 
@@ -95,13 +96,7 @@ def refund():
                                                                      
instance=INSTANCE))
     # This (and the double if-else) will disappear once #5090 is solved.
     if r.status_code != 200:
-        logger.error("Backend error: status code: " + str(r.status_code))
-        try:
-            return flask.jsonify(r.json()), r.status_code
-        except json.decoder.JSONDecodeError:
-            logger.error("Backend error (NO JSON returned): status code: " + 
str(r.status_code))
-            return flask.jsonify(dict(error="Backend died, no JSON got from 
it")), 502
-
+        return backend_error(r)
     if flask.request.method == "POST":
         response = flask.make_response()
         response.headers["X-Taler-Refund-Url"] = make_url("/refund/test", 
("order_id", order_id))
@@ -137,10 +132,7 @@ def generate_contract():
     )
     r = requests.post(urljoin(BACKEND_URL, "proposal"), json=dict(order=order))
     if r.status_code != 200:
-        try:
-            return flask.jsonify(r.json()), r.status_code
-        except json.decoder.JSONDecodeError:
-            return flask.jsonify(dict(error="Backend died, no JSON got from 
it")), 502
+        return backend_error(r)
     proposal_resp = r.json()
     return flask.jsonify(**proposal_resp)
 
@@ -184,7 +176,7 @@ def pay():
         return e, 400
     r = requests.post(urljoin(BACKEND_URL, "pay"), json=deposit_permission)
     if 200 != r.status_code:
-        return flask.jsonify(r.json()), r.status_code
+        return backend_error(r)
     proposal_data = r.json()["contract_terms"]
     article_name = proposal_data["extra"]["article_name"]
     payed_articles = flask.session["payed_articles"] = 
flask.session.get("payed_articles", [])
@@ -213,7 +205,8 @@ def track_transfer():
     qs = get_query_string().decode("utf-8")
     url = urljoin(BACKEND_URL, "track/transfer")
     r = requests.get(url, params=dict(parse_qsl(qs)))
-    return flask.jsonify(r.json()), r.status_code
+    if 200 != r.status_code:
+        return backend_error(r)
 
 
 @app.route("/track/order")
@@ -221,4 +214,5 @@ def track_order():
     qs = get_query_string().decode("utf-8")
     url = urljoin(BACKEND_URL, "track/transaction")
     r = requests.get(url, params=dict(parse_qsl(qs)))
-    return flask.jsonify(r.json()), r.status_code
+    if 200 != r.status_code:
+        return backend_error(r)
diff --git a/talerfrontends/helpers.py b/talerfrontends/helpers.py
index 99aaa1a..c0c3caf 100644
--- a/talerfrontends/helpers.py
+++ b/talerfrontends/helpers.py
@@ -87,3 +87,12 @@ def expect_parameter(name, alt=None):
 
 def get_query_string():
     return request.query_string
+
+def backend_error(requests_response):
+    logger.error("Backend error: status code: " + str(r.status_code))
+    try:
+        return flask.jsonify(r.json()), r.status_code
+    except json.decoder.JSONDecodeError:
+        logger.error("Backend error (NO JSON returned): status code: " + 
str(r.status_code))
+        return flask.jsonify(dict(error="Backend died, no JSON got from it")), 
502
+

-- 
To stop receiving notification emails like this one, please contact
address@hidden