gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-anastasis] branch master updated: fix #6764


From: gnunet
Subject: [taler-anastasis] branch master updated: fix #6764
Date: Fri, 19 Mar 2021 20:17:25 +0100

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 2b973f1  fix #6764
2b973f1 is described below

commit 2b973f18f3e44eb010855243e4e4db6f195dd7a9
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Fri Mar 19 20:17:22 2021 +0100

    fix #6764
---
 src/backend/anastasis-httpd.c               |  7 +++----
 src/reducer/anastasis_api_backup_redux.c    | 26 +++++++++++++++++++++-----
 src/restclient/anastasis_api_policy_store.c |  4 ++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/backend/anastasis-httpd.c b/src/backend/anastasis-httpd.c
index 5204201..54583fa 100644
--- a/src/backend/anastasis-httpd.c
+++ b/src/backend/anastasis-httpd.c
@@ -768,11 +768,10 @@ run (void *cls,
                                              "ANNUAL_POLICY_UPLOAD_LIMIT",
                                              &AH_post_counter))
   {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+    /* only warn, we will use the default */
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
                                "anastasis",
-                               "FULFILLMENT_URL");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
+                               "ANNUAL_POLICY_UPLOAD_LIMIT");
   }
 
   if (GNUNET_OK !=
diff --git a/src/reducer/anastasis_api_backup_redux.c 
b/src/reducer/anastasis_api_backup_redux.c
index 5543543..75d1fdd 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -1442,11 +1442,27 @@ secret_share_result_cb (void *cls,
             uc->state);
     break;
   case ANASTASIS_SHARE_STATUS_PROVIDER_FAILED:
-    // FIXME-#6764: extract more failure data from sr to give back to 
application
-    ANASTASIS_redux_fail_ (uc->cb,
-                           uc->cb_cls,
-                           TALER_EC_ANASTASIS_REDUCER_BACKUP_PROVIDER_FAILED,
-                           "provider failure");
+    {
+      json_t *details;
+      enum TALER_ErrorCode ec;
+
+      ec = TALER_EC_ANASTASIS_REDUCER_BACKUP_PROVIDER_FAILED;
+      details = json_pack ("{s:I, s:I, s:s, s:I}",
+                           "http_status",
+                           (json_int_t) 
sr->details.provider_failure.http_status,
+                           "upload_status",
+                           (json_int_t) sr->details.provider_failure.ec,
+                           "provider_url",
+                           sr->details.provider_failure.provider_url,
+                           "code",
+                           (json_int_t) ec,
+                           "hint",
+                           "hint", TALER_ErrorCode_get_hint (ec));
+      uc->cb (uc->cb_cls,
+              ec,
+              details);
+      json_decref (details);
+    }
     break;
   default:
     GNUNET_break (0);
diff --git a/src/restclient/anastasis_api_policy_store.c 
b/src/restclient/anastasis_api_policy_store.c
index b11ddc0..e4f8bd5 100644
--- a/src/restclient/anastasis_api_policy_store.c
+++ b/src/restclient/anastasis_api_policy_store.c
@@ -169,6 +169,10 @@ handle_policy_store_finished (void *cls,
     ud.us = ANASTASIS_US_PAYMENT_REQUIRED;
     ud.details.payment.payment_request = pso->pay_uri;
     break;
+  case MHD_HTTP_PAYLOAD_TOO_LARGE:
+    ud.us = ANASTASIS_US_CLIENT_ERROR;
+    ud.ec = TALER_EC_GENERIC_UPLOAD_EXCEEDS_LIMIT;
+    break;
   case MHD_HTTP_LENGTH_REQUIRED:
     GNUNET_break (0);
     ud.ec = TALER_JSON_get_error_code2 (data,

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]