all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-backup v3 1/1] file-restore: remove 'json-error' parameter from list_files
Date: Fri, 27 May 2022 10:22:03 +0200	[thread overview]
Message-ID: <20220527082203.1653182-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220527082203.1653182-1-d.csapak@proxmox.com>

we can reuse the 'output_format' here
also remove the 'error: true' here. we can determine it was an error,
by checking if it's an object with a 'message' property

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 proxmox-file-restore/src/main.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs
index 3420ea8e..ee5b5b9c 100644
--- a/proxmox-file-restore/src/main.rs
+++ b/proxmox-file-restore/src/main.rs
@@ -217,12 +217,6 @@ async fn list_files(
                 schema: OUTPUT_FORMAT,
                 optional: true,
             },
-            "json-error": {
-                type: Boolean,
-                description: "If set, errors are returned as json instead of writing to stderr",
-                optional: true,
-                default: false,
-            },
             "timeout": {
                 type: Integer,
                 description: "Defines the maximum time the call can should take.",
@@ -245,7 +239,6 @@ async fn list(
     snapshot: String,
     path: String,
     base64: bool,
-    json_error: bool,
     timeout: Option<u64>,
     param: Value,
 ) -> Result<(), Error> {
@@ -290,7 +283,7 @@ async fn list(
     let output_format = get_output_format(&param);
 
     if let Err(err) = result {
-        if !json_error {
+        if &output_format == "text" {
             return Err(err);
         }
         let (msg, code) = match err.downcast_ref::<HttpError>() {
@@ -298,7 +291,6 @@ async fn list(
             None => (err.to_string(), None),
         };
         let mut json_err = json!({
-            "error": true,
             "message": msg,
         });
         if let Some(code) = code {
-- 
2.30.2





WARNING: multiple messages have this Message-ID
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v3 1/1] file-restore: remove 'json-error' parameter from list_files
Date: Fri, 27 May 2022 10:22:03 +0200	[thread overview]
Message-ID: <20220527082203.1653182-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220527082203.1653182-1-d.csapak@proxmox.com>

we can reuse the 'output_format' here
also remove the 'error: true' here. we can determine it was an error,
by checking if it's an object with a 'message' property

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 proxmox-file-restore/src/main.rs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs
index 3420ea8e..ee5b5b9c 100644
--- a/proxmox-file-restore/src/main.rs
+++ b/proxmox-file-restore/src/main.rs
@@ -217,12 +217,6 @@ async fn list_files(
                 schema: OUTPUT_FORMAT,
                 optional: true,
             },
-            "json-error": {
-                type: Boolean,
-                description: "If set, errors are returned as json instead of writing to stderr",
-                optional: true,
-                default: false,
-            },
             "timeout": {
                 type: Integer,
                 description: "Defines the maximum time the call can should take.",
@@ -245,7 +239,6 @@ async fn list(
     snapshot: String,
     path: String,
     base64: bool,
-    json_error: bool,
     timeout: Option<u64>,
     param: Value,
 ) -> Result<(), Error> {
@@ -290,7 +283,7 @@ async fn list(
     let output_format = get_output_format(&param);
 
     if let Err(err) = result {
-        if !json_error {
+        if &output_format == "text" {
             return Err(err);
         }
         let (msg, code) = match err.downcast_ref::<HttpError>() {
@@ -298,7 +291,6 @@ async fn list(
             None => (err.to_string(), None),
         };
         let mut json_err = json!({
-            "error": true,
             "message": msg,
         });
         if let Some(code) = code {
-- 
2.30.2





  parent reply	other threads:[~2022-05-27  8:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-27  8:22 [pve-devel] [PATCH common/storage/proxmxo-backup v3] improve file-restore timeout behaviour Dominik Csapak
2022-05-27  8:22 ` [pbs-devel] " Dominik Csapak
2022-05-27  8:22 ` [pve-devel] [PATCH common v3 1/1] PBSClient: file_restore_list: add timeout parameter Dominik Csapak
2022-05-27  8:22   ` [pbs-devel] " Dominik Csapak
2022-11-07 14:17   ` [pve-devel] " Thomas Lamprecht
2022-11-07 14:17     ` [pbs-devel] " Thomas Lamprecht
2022-11-08 11:20     ` Dominik Csapak
2022-11-08 11:20       ` [pbs-devel] " Dominik Csapak
2022-11-08 15:53       ` Thomas Lamprecht
2022-11-08 15:53         ` [pbs-devel] " Thomas Lamprecht
2022-11-09  7:07         ` Dominik Csapak
2022-11-09  7:07           ` [pbs-devel] " Dominik Csapak
2022-05-27  8:22 ` [pve-devel] [PATCH storage v3 1/1] api: FileRestore: decode and return proper error with new file-restore params Dominik Csapak
2022-05-27  8:22   ` [pbs-devel] " Dominik Csapak
2022-05-27  8:22 ` Dominik Csapak [this message]
2022-05-27  8:22   ` [pbs-devel] [PATCH proxmox-backup v3 1/1] file-restore: remove 'json-error' parameter from list_files Dominik Csapak
2022-10-05 17:34   ` [pve-devel] applied: " Thomas Lamprecht
2022-10-05 17:34     ` [pbs-devel] applied: " Thomas Lamprecht
2022-10-25 10:17 ` [pve-devel] [PATCH common/storage/proxmxo-backup v3] improve file-restore timeout behaviour Dominik Csapak
2022-10-25 10:17   ` [pbs-devel] " Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220527082203.1653182-4-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal