public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] backup-proxy: fix api log reopen send_command calls
Date: Mon, 11 Oct 2021 10:35:21 +0200	[thread overview]
Message-ID: <20211011083521.2222148-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211011083521.2222148-1-d.csapak@proxmox.com>

we must give a json value to send_command, else the string gets
serialized and sent to the socket which does not get serialized as
an object but a string, and the command fails with:

'unable to parse parameters (expected json object)'

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/bin/proxmox-backup-proxy.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index 4c879483..9fcd41f1 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -852,14 +852,15 @@ async fn schedule_task_log_rotate() {
 }
 
 async fn command_reopen_access_logfiles() -> Result<(), Error> {
+    let cmd = json!({"command":"api-access-log-reopen"});
     // only care about the most recent daemon instance for each, proxy & api, as other older ones
     // should not respond to new requests anyway, but only finish their current one and then exit.
     let sock = proxmox_rest_server::our_ctrl_sock();
-    let f1 = proxmox_rest_server::send_command(sock, "{\"command\":\"api-access-log-reopen\"}\n");
+    let f1 = proxmox_rest_server::send_command(sock, &cmd);
 
     let pid = proxmox_rest_server::read_pid(pbs_buildcfg::PROXMOX_BACKUP_API_PID_FN)?;
     let sock = proxmox_rest_server::ctrl_sock_from_pid(pid);
-    let f2 = proxmox_rest_server::send_command(sock, "{\"command\":\"api-access-log-reopen\"}\n");
+    let f2 = proxmox_rest_server::send_command(sock, &cmd);
 
     match futures::join!(f1, f2) {
         (Err(e1), Err(e2)) => Err(format_err!("reopen commands failed, proxy: {}; api: {}", e1, e2)),
@@ -870,14 +871,15 @@ async fn command_reopen_access_logfiles() -> Result<(), Error> {
 }
 
 async fn command_reopen_auth_logfiles() -> Result<(), Error> {
+    let cmd = json!({"command":"api-auth-log-reopen"});
     // only care about the most recent daemon instance for each, proxy & api, as other older ones
     // should not respond to new requests anyway, but only finish their current one and then exit.
     let sock = proxmox_rest_server::our_ctrl_sock();
-    let f1 = proxmox_rest_server::send_command(sock, "{\"command\":\"api-auth-log-reopen\"}\n");
+    let f1 = proxmox_rest_server::send_command(sock, &cmd);
 
     let pid = proxmox_rest_server::read_pid(pbs_buildcfg::PROXMOX_BACKUP_API_PID_FN)?;
     let sock = proxmox_rest_server::ctrl_sock_from_pid(pid);
-    let f2 = proxmox_rest_server::send_command(sock, "{\"command\":\"api-auth-log-reopen\"}\n");
+    let f2 = proxmox_rest_server::send_command(sock, &cmd);
 
     match futures::join!(f1, f2) {
         (Err(e1), Err(e2)) => Err(format_err!("reopen commands failed, proxy: {}; api: {}", e1, e2)),
-- 
2.30.2





  reply	other threads:[~2021-10-11  8:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-11  8:35 [pbs-devel] [PATCH proxmox-backup 1/2] rest-server/worker-task: replace newlines with '\n' in task result Dominik Csapak
2021-10-11  8:35 ` Dominik Csapak [this message]
2021-10-11 11:32   ` [pbs-devel] [PATCH proxmox-backup 2/2] backup-proxy: fix api log reopen send_command calls Thomas Lamprecht
2021-10-11 11:48     ` Wolfgang Bumiller
2021-10-11  8:38 ` [pbs-devel] [PATCH proxmox-backup 1/2] rest-server/worker-task: replace newlines with '\n' in task result 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=20211011083521.2222148-2-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal