[taler-anastasis] branch master updated: -fix error handling

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 6594f0d  -fix error handling
6594f0d is described below

commit 6594f0dca75a8e1766ca0c7ade23d2a8455ec234
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Oct 6 11:33:46 2021 +0200

    -fix error handling
---
 src/backend/anastasis-httpd_policy_upload.c | 7 +++----
 src/lib/anastasis_backup.c                  | 2 +-
 src/reducer/anastasis_api_backup_redux.c    | 2 --
 src/restclient/anastasis_api_policy_store.c | 5 +++++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/backend/anastasis-httpd_policy_upload.c 
b/src/backend/anastasis-httpd_policy_upload.c
index c36cc17..0f9d8d6 100644
--- a/src/backend/anastasis-httpd_policy_upload.c
+++ b/src/backend/anastasis-httpd_policy_upload.c
@@ -323,11 +323,10 @@ proposal_cb (void *cls,
   AH_trigger_daemon (NULL);
   if (MHD_HTTP_OK != por->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Backend returned status %u/%d\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Backend returned status %u/%d when trying to setup order\n",
                 por->hr.http_status,
                 (int) por->hr.ec);
-    GNUNET_break (0);
     puc->resp = TALER_MHD_MAKE_JSON_PACK (
       GNUNET_JSON_pack_uint64 ("code",
                                TALER_EC_SYNC_PAYMENT_CREATE_BACKEND_ERROR),
@@ -340,7 +339,7 @@ proposal_cb (void *cls,
       GNUNET_JSON_pack_allow_null (
         GNUNET_JSON_pack_object_incref ("backend-reply",
                                         (json_t *) por->hr.reply)));
-    puc->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
+    puc->response_code = MHD_HTTP_BAD_GATEWAY;
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/lib/anastasis_backup.c b/src/lib/anastasis_backup.c
index 6747d73..a1f162a 100644
--- a/src/lib/anastasis_backup.c
+++ b/src/lib/anastasis_backup.c
@@ -651,7 +651,7 @@ policy_store_cb (void *cls,
         .ss = ANASTASIS_SHARE_STATUS_PROVIDER_FAILED,
         .details.provider_failure.provider_url = pss->anastasis_url,
         .details.provider_failure.http_status = ud->http_status,
-        .details.provider_failure.ec = us,
+        .details.provider_failure.ec = ud->ec,
       };
 
       ss->src (ss->src_cls,
diff --git a/src/reducer/anastasis_api_backup_redux.c 
b/src/reducer/anastasis_api_backup_redux.c
index cb3bd5a..82d26ed 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -3142,8 +3142,6 @@ secret_share_result_cb (void *cls,
       json_t *details;
 
       details = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_string ("backup_state",
-                                 "ERROR"),
         GNUNET_JSON_pack_uint64 ("http_status",
                                  sr->details.provider_failure.http_status),
         GNUNET_JSON_pack_uint64 ("upload_status",
diff --git a/src/restclient/anastasis_api_policy_store.c 
b/src/restclient/anastasis_api_policy_store.c
index 5d44094..0333a13 100644
--- a/src/restclient/anastasis_api_policy_store.c
+++ b/src/restclient/anastasis_api_policy_store.c
@@ -227,6 +227,11 @@ handle_policy_store_finished (void *cls,
                                         data_size);
     ud.us = ANASTASIS_US_SERVER_ERROR;
     break;
+  case MHD_HTTP_BAD_GATEWAY:
+    ud.ec = TALER_JSON_get_error_code2 (data,
+                                        data_size);
+    ud.us = ANASTASIS_US_SERVER_ERROR;
+    break;
   default:
     ud.ec = TALER_JSON_get_error_code2 (data,
                                         data_size);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.