From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 498E1749E5 for ; Mon, 11 Oct 2021 13:32:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3639F1EBDC for ; Mon, 11 Oct 2021 13:32:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2E3341EBCE for ; Mon, 11 Oct 2021 13:32:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D3CF445CC3 for ; Mon, 11 Oct 2021 13:32:55 +0200 (CEST) Message-ID: <2f79aeb3-435e-9845-940e-638a60a6d0a2@proxmox.com> Date: Mon, 11 Oct 2021 13:32:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:94.0) Gecko/20100101 Thunderbird/94.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Dominik Csapak References: <20211011083521.2222148-1-d.csapak@proxmox.com> <20211011083521.2222148-2-d.csapak@proxmox.com> Cc: Wolfgang Bumiller From: Thomas Lamprecht In-Reply-To: <20211011083521.2222148-2-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.208 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup 2/2] backup-proxy: fix api log reopen send_command calls X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2021 11:32:57 -0000 On 11.10.21 10:35, Dominik Csapak wrote: > 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)' > Would get a Fixes: commit 45b8a0327f21f048bb4384bafc292954358b5651 Wolfgang any comment? https://git.proxmox.com/?p=proxmox-backup.git;a=commitdiff;h=45b8a0327f21f048bb4384bafc292954358b5651 > Signed-off-by: Dominik Csapak > --- > 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)), >